* [PATCH]acpi:glue.c Fix warning: variable 'ret' set but not used
@ 2010-07-02 1:14 Justin P. Mattock
2010-07-31 18:50 ` Justin P. Mattock
0 siblings, 1 reply; 2+ messages in thread
From: Justin P. Mattock @ 2010-07-02 1:14 UTC (permalink / raw)
To: linux-acpi; +Cc: lenb, dhowells, linux-kernel, Justin P. Mattock
Fix a warning message generated by gcc:
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@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH]acpi:glue.c Fix warning: variable 'ret' set but not used
2010-07-02 1:14 [PATCH]acpi:glue.c Fix warning: variable 'ret' set but not used Justin P. Mattock
@ 2010-07-31 18:50 ` Justin P. Mattock
0 siblings, 0 replies; 2+ messages in thread
From: Justin P. Mattock @ 2010-07-31 18:50 UTC (permalink / raw)
To: Justin P. Mattock; +Cc: linux-acpi, lenb, dhowells, linux-kernel
whats going on with this patch? havent heard anything on this.
> Fix a warning message generated by gcc:
> 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@gmail.com>
> Signed-off-by: David Howells<dhowells@redhat.com>
>
> ---
> 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,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-31 18:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-02 1:14 [PATCH]acpi:glue.c Fix warning: variable 'ret' set but not used Justin P. Mattock
2010-07-31 18:50 ` Justin P. Mattock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).