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

["Justin P. Mattock" <justinmattock@gmail.com>]

On 06/29/2010 08:47 AM, David Howells wrote:
> Justin P. Mattock<justinmattock@gmail.com>  wrote:
>
>> +	if (fn) {
>> + 			printk(KERN_WARNING "dev%d: Failed to create
>> firmware_node: %d\n", status, fn);
>> +	}else if (pn) {
>> +			printk(KERN_WARNING "dev%d: Failed to create
>> physical_node: %d\n", status, pn);
>> + 			return 0;
>> +		}
>
> The if-statement should be correctly indented (it's inside another
> if-body, so needs to be one more tab over) and there needs to be a space
> before the else.
>
> You should probably split your printks up so they don't exceed 80 chars too,
> for example:
>
> 			printk(KERN_WARNING
> 			       "dev%d: Failed to create physical_node: %d\n",
> 			       status, pn);
>
> Also 'status' is probably the wrong thing to print as the number in "dev%d".
> If it worked, that should be unconditionally AE_OK, I think.  Can you not use
> dev_warn() or similar instead or printk?
>
> David
>


o.k. heres another go at this.. this goes through, using dev_warn
but am uncertain about using these three for the right info dev, %p, 
dev_acpi

but give it a look whenever you have the time, and let me know
then I'll go from there..



 From 34485b5709dc9ad18c57be8c672236580300e05c Mon Sep 17 00:00:00 2001
From: Justin P. Mattock <justinmattock@gmail.com>
Date: Tue, 29 Jun 2010 14:47:42 -0700
Subject: [PATCH ]ACPI:glue.c
  Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

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

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4af6301..69ca24d 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,20 @@ 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) {
+		dev_warn(dev, "dev:%p Failed to create firmware_node: %d\n",
+			acpi_dev, fn);
+
+		} else if (pn) {
+		dev_warn(dev, "dev:%p Failed to create physical_node: %d\n",
+			acpi_dev, 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