diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-07-20 18:18:36 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-08-15 00:53:08 -0400 |
commit | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (patch) | |
tree | 9c99026f29b863ca0541699e45349b8fa40ea93a /drivers/acpi/video.c | |
parent | 43d9f87b79804f2d75d9d8a81c862b179f055a15 (diff) |
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, | |||
2167 | status = acpi_video_bus_get_one_device(dev, video); | 2167 | status = acpi_video_bus_get_one_device(dev, video); |
2168 | if (ACPI_FAILURE(status)) { | 2168 | if (ACPI_FAILURE(status)) { |
2169 | printk(KERN_WARNING PREFIX | 2169 | printk(KERN_WARNING PREFIX |
2170 | "Cant attach device"); | 2170 | "Cant attach device\n"); |
2171 | continue; | 2171 | continue; |
2172 | } | 2172 | } |
2173 | } | 2173 | } |
@@ -2177,19 +2177,19 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, | |||
2177 | static int acpi_video_bus_put_one_device(struct acpi_video_device *device) | 2177 | static int acpi_video_bus_put_one_device(struct acpi_video_device *device) |
2178 | { | 2178 | { |
2179 | acpi_status status; | 2179 | acpi_status status; |
2180 | struct acpi_video_bus *video; | ||
2181 | |||
2182 | 2180 | ||
2183 | if (!device || !device->video) | 2181 | if (!device || !device->video) |
2184 | return -ENOENT; | 2182 | return -ENOENT; |
2185 | 2183 | ||
2186 | video = device->video; | ||
2187 | |||
2188 | acpi_video_device_remove_fs(device->dev); | 2184 | acpi_video_device_remove_fs(device->dev); |
2189 | 2185 | ||
2190 | status = acpi_remove_notify_handler(device->dev->handle, | 2186 | status = acpi_remove_notify_handler(device->dev->handle, |
2191 | ACPI_DEVICE_NOTIFY, | 2187 | ACPI_DEVICE_NOTIFY, |
2192 | acpi_video_device_notify); | 2188 | acpi_video_device_notify); |
2189 | if (ACPI_FAILURE(status)) { | ||
2190 | printk(KERN_WARNING PREFIX | ||
2191 | "Cant remove video notify handler\n"); | ||
2192 | } | ||
2193 | if (device->backlight) { | 2193 | if (device->backlight) { |
2194 | sysfs_remove_link(&device->backlight->dev.kobj, "device"); | 2194 | sysfs_remove_link(&device->backlight->dev.kobj, "device"); |
2195 | backlight_device_unregister(device->backlight); | 2195 | backlight_device_unregister(device->backlight); |