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>

diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 058b3df48271ac39f622e819ceadc329a8ecd9fb..f5cca3a1300c60c1d3fae972389031d27782e1a1 100644 (file)
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -279,13 +279,10 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 
 acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
 {
-       acpi_thread_id this_thread_id;
-
        ACPI_FUNCTION_NAME(ut_release_mutex);
 
-       this_thread_id = acpi_os_get_thread_id();
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %p releasing Mutex [%s]\n",
-                         ACPI_CAST_PTR(void, this_thread_id),
+                         ACPI_CAST_PTR(void, acpi_os_get_thread_id()),
                          acpi_ut_get_mutex_name(mutex_id)));
 
        if (mutex_id > ACPI_MAX_MUTEX) {

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index b0337d3146047d150c8a62eb8e5756282e5ea5f0..5718566e00f9b27573db228ba74559570ba48f89 100644 (file)
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -255,12 +255,10 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
 
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
-       struct acpi_table_srat *srat;
-
        if (!table)
                return -EINVAL;
 
-       srat = (struct acpi_table_srat *)table;
+       /* Real work done in acpi_table_parse_srat below. */
 
        return 0;
 }

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 44bddc5bc6adfae35187586a2c05ed5d72a7041e..03017b1eb38bb9b8d667074158cd5df33b102e36 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -141,15 +141,14 @@ static struct osi_linux {
 static void __init acpi_request_region (struct acpi_generic_address *addr,
        unsigned int length, char *desc)
 {
-       struct resource *res;
-
        if (!addr->address || !length)
                return;
 
+       /* Resources are never freed */
        if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
-               res = request_region(addr->address, length, desc);
+               request_region(addr->address, length, desc);
        else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-               res = request_mem_region(addr->address, length, desc);
+               request_mem_region(addr->address, length, desc);
 }
 
 static int __init acpi_reserve_resources(void)

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 4fe5018fd6ab70b26bd06d4bc58d57d837e14a3c..cf073aa0709b9b99e1a7e5a5eb6767396107c0ed 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -242,8 +242,6 @@ static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
        acpi_status status = AE_OK;
        struct acpi_power_resource *resource = NULL;
        struct list_head *node, *next;
-       struct acpi_power_reference *ref;
-
 
        result = acpi_power_get_context(handle, &resource);
        if (result)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5cbc0cb73e2c6c2b3811e74bc7650fa2ea389b0a..07bc74d8356ea2a75188330a87d117da995ea91b 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -722,13 +722,12 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
        } else if (cx->entry_method == ACPI_CSTATE_HALT) {
                acpi_safe_halt();
        } else {
-               int unused;
                /* IO port based C-state */
                inb(cx->address);
                /* Dummy wait op - must do something useless after P_LVL2 read
                   because chipsets cannot guarantee that STPCLK# signal
                   gets asserted in time to freeze execution properly. */
-               unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
+               inl(acpi_gbl_FADT.xpm_timer_block.address);
        }
        start_critical_timings();
 }

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 909ae7bf3b938168a016d235878ed8d56027ecba..67dec0c675aae4d59e71c689ccc450ff5896c5c6 100644 (file)
--- 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);

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 7b5eea7e01dc83e5a42f0c075472ca67ef7e38ee..8b5ea399a4f4fa7dfe04765292f31af4c8750fba 100644 (file)
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -145,12 +145,6 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
        struct ata_eh_info *ehi = &ap->link.eh_info;
        int wait = 0;
        unsigned long flags;
-       acpi_handle handle;
-
-       if (dev)
-               handle = dev->acpi_handle;
-       else
-               handle = ap->acpi_handle;
 
        spin_lock_irqsave(ap->lock, flags);
        /*