diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-07-21 00:18:36 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-08-15 06:53:08 +0200 |
commit | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (patch) | |
tree | 9c99026f29b863ca0541699e45349b8fa40ea93a /drivers/acpi/video.c | |
parent | ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS (diff) | |
download | linux-cfa806f059801dbe7e435745eb2e187c8bfe1e7f.tar.xz linux-cfa806f059801dbe7e435745eb2e187c8bfe1e7f.zip |
gcc-4.6: ACPI: fix unused but set variables in ACPI
Some minor improvements in error handling, but overall it was mostly dead
code.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r-- | drivers/acpi/video.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 909ae7bf3b93..67dec0c675aa 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -2167,7 +2167,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, status = acpi_video_bus_get_one_device(dev, video); if (ACPI_FAILURE(status)) { printk(KERN_WARNING PREFIX - "Cant attach device"); + "Cant attach device\n"); continue; } } @@ -2177,19 +2177,19 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, static int acpi_video_bus_put_one_device(struct acpi_video_device *device) { acpi_status status; - struct acpi_video_bus *video; - if (!device || !device->video) return -ENOENT; - video = device->video; - acpi_video_device_remove_fs(device->dev); status = acpi_remove_notify_handler(device->dev->handle, ACPI_DEVICE_NOTIFY, acpi_video_device_notify); + if (ACPI_FAILURE(status)) { + printk(KERN_WARNING PREFIX + "Cant remove video notify handler\n"); + } if (device->backlight) { sysfs_remove_link(&device->backlight->dev.kobj, "device"); backlight_device_unregister(device->backlight); |