Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set but notused

[Justin P. Mattock]

> Not sure it's worth going that far.  You could reduce it still further:
>
> 		if (fn || pn)
> 			dev_warn(&acpi_dev->dev,
> 				 "Failed to create link(s) to %s %s:"
> 				 " %d\n",
> 				 dev_driver_string(dev), dev_name(dev),
> 				 fn ?: pn);
>
> Is it that important to know which failed to be created, or that both failed
> to be created?
>
> David


I like this..

fn ?: pn  (will this give us the results from the above question?
_both failed to be created_)
a bit confused with the whole:  "?:" though
*condition ? value if true : value if false* (what if both are true
what if both are false or does it matter?)

here is the patch itself with the change:



Fix a warning message generated by gcc:
Im getting a warning message when building with gcc 4.6.0
  CC      drivers/acpi/glue.o
drivers/acpi/glue.c: In function 'acpi_bind_one':
drivers/acpi/glue.c:163:7: warning: variable 'ret' set but not used

Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>

---
 drivers/acpi/glue.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4af6301..23b16e6 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -145,6 +145,7 @@ static int acpi_bind_one(struct device *dev, 
acpi_handle handle)
 {
 	struct acpi_device *acpi_dev;
 	acpi_status status;
+	int fn, pn;

 	if (dev->archdata.acpi_handle) {
 		dev_warn(dev, "Drivers changed 'acpi_handle'\n");
@@ -160,12 +161,19 @@ static int acpi_bind_one(struct device *dev, 
acpi_handle handle)

 	status = acpi_bus_get_device(handle, &acpi_dev);
 	if (!ACPI_FAILURE(status)) {
-		int ret;

-		ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
+		fn = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
 				"firmware_node");
-		ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
+		pn = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
 				"physical_node");
+		if (fn || pn) {
+			dev_warn(&acpi_dev->dev,
+				"Failed to create link(s) to %s %s:"
+				" %d\n",
+				dev_driver_string(dev), dev_name(dev),
+				fn ?: pn);
+				return AE_ERROR;
+		}
 		if (acpi_dev->wakeup.flags.valid) {
 			device_set_wakeup_capable(dev, true);
 			device_set_wakeup_enable(dev,
-- 1.7.1.rc1.21.gf3bd6


Justin P. Mattock
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/