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>
This commit is contained in:
@@ -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_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
|
||||||
{
|
{
|
||||||
acpi_thread_id this_thread_id;
|
|
||||||
|
|
||||||
ACPI_FUNCTION_NAME(ut_release_mutex);
|
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_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)));
|
acpi_ut_get_mutex_name(mutex_id)));
|
||||||
|
|
||||||
if (mutex_id > ACPI_MAX_MUTEX) {
|
if (mutex_id > ACPI_MAX_MUTEX) {
|
||||||
|
@@ -255,12 +255,10 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
|
|||||||
|
|
||||||
static int __init acpi_parse_srat(struct acpi_table_header *table)
|
static int __init acpi_parse_srat(struct acpi_table_header *table)
|
||||||
{
|
{
|
||||||
struct acpi_table_srat *srat;
|
|
||||||
|
|
||||||
if (!table)
|
if (!table)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
srat = (struct acpi_table_srat *)table;
|
/* Real work done in acpi_table_parse_srat below. */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@@ -141,15 +141,14 @@ static struct osi_linux {
|
|||||||
static void __init acpi_request_region (struct acpi_generic_address *addr,
|
static void __init acpi_request_region (struct acpi_generic_address *addr,
|
||||||
unsigned int length, char *desc)
|
unsigned int length, char *desc)
|
||||||
{
|
{
|
||||||
struct resource *res;
|
|
||||||
|
|
||||||
if (!addr->address || !length)
|
if (!addr->address || !length)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* Resources are never freed */
|
||||||
if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
|
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)
|
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)
|
static int __init acpi_reserve_resources(void)
|
||||||
|
@@ -242,8 +242,6 @@ static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
|
|||||||
acpi_status status = AE_OK;
|
acpi_status status = AE_OK;
|
||||||
struct acpi_power_resource *resource = NULL;
|
struct acpi_power_resource *resource = NULL;
|
||||||
struct list_head *node, *next;
|
struct list_head *node, *next;
|
||||||
struct acpi_power_reference *ref;
|
|
||||||
|
|
||||||
|
|
||||||
result = acpi_power_get_context(handle, &resource);
|
result = acpi_power_get_context(handle, &resource);
|
||||||
if (result)
|
if (result)
|
||||||
|
@@ -722,13 +722,12 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
|
|||||||
} else if (cx->entry_method == ACPI_CSTATE_HALT) {
|
} else if (cx->entry_method == ACPI_CSTATE_HALT) {
|
||||||
acpi_safe_halt();
|
acpi_safe_halt();
|
||||||
} else {
|
} else {
|
||||||
int unused;
|
|
||||||
/* IO port based C-state */
|
/* IO port based C-state */
|
||||||
inb(cx->address);
|
inb(cx->address);
|
||||||
/* Dummy wait op - must do something useless after P_LVL2 read
|
/* Dummy wait op - must do something useless after P_LVL2 read
|
||||||
because chipsets cannot guarantee that STPCLK# signal
|
because chipsets cannot guarantee that STPCLK# signal
|
||||||
gets asserted in time to freeze execution properly. */
|
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();
|
start_critical_timings();
|
||||||
}
|
}
|
||||||
|
@@ -2167,7 +2167,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
|
|||||||
status = acpi_video_bus_get_one_device(dev, video);
|
status = acpi_video_bus_get_one_device(dev, video);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
printk(KERN_WARNING PREFIX
|
printk(KERN_WARNING PREFIX
|
||||||
"Cant attach device");
|
"Cant attach device\n");
|
||||||
continue;
|
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)
|
static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
struct acpi_video_bus *video;
|
|
||||||
|
|
||||||
|
|
||||||
if (!device || !device->video)
|
if (!device || !device->video)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
video = device->video;
|
|
||||||
|
|
||||||
acpi_video_device_remove_fs(device->dev);
|
acpi_video_device_remove_fs(device->dev);
|
||||||
|
|
||||||
status = acpi_remove_notify_handler(device->dev->handle,
|
status = acpi_remove_notify_handler(device->dev->handle,
|
||||||
ACPI_DEVICE_NOTIFY,
|
ACPI_DEVICE_NOTIFY,
|
||||||
acpi_video_device_notify);
|
acpi_video_device_notify);
|
||||||
|
if (ACPI_FAILURE(status)) {
|
||||||
|
printk(KERN_WARNING PREFIX
|
||||||
|
"Cant remove video notify handler\n");
|
||||||
|
}
|
||||||
if (device->backlight) {
|
if (device->backlight) {
|
||||||
sysfs_remove_link(&device->backlight->dev.kobj, "device");
|
sysfs_remove_link(&device->backlight->dev.kobj, "device");
|
||||||
backlight_device_unregister(device->backlight);
|
backlight_device_unregister(device->backlight);
|
||||||
|
@@ -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;
|
struct ata_eh_info *ehi = &ap->link.eh_info;
|
||||||
int wait = 0;
|
int wait = 0;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
acpi_handle handle;
|
|
||||||
|
|
||||||
if (dev)
|
|
||||||
handle = dev->acpi_handle;
|
|
||||||
else
|
|
||||||
handle = ap->acpi_handle;
|
|
||||||
|
|
||||||
spin_lock_irqsave(ap->lock, flags);
|
spin_lock_irqsave(ap->lock, flags);
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user