Skip to content

Commit

Permalink
gcc-4.6: ACPI: fix unused but set variables in ACPI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andi Kleen authored and lenb committed Aug 15, 2010
1 parent 43d9f87 commit cfa806f
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 26 deletions.
5 changes: 1 addition & 4 deletions drivers/acpi/acpica/utmutex.c
Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions drivers/acpi/numa.c
Expand Up @@ -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;
}
Expand Down
7 changes: 3 additions & 4 deletions drivers/acpi/osl.c
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions drivers/acpi/power.c
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions drivers/acpi/processor_idle.c
Expand Up @@ -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();
}
Expand Down
10 changes: 5 additions & 5 deletions drivers/acpi/video.c
Expand Up @@ -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;
}
}
Expand All @@ -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);
Expand Down
6 changes: 0 additions & 6 deletions drivers/ata/libata-acpi.c
Expand Up @@ -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);
/*
Expand Down

0 comments on commit cfa806f

Please sign in to comment.