Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa806f0 authored by Andi Kleen's avatar Andi Kleen Committed by Len Brown
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 43d9f87b

drivers/acpi/acpica/utmutex.c

+1 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/acpi/numa.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/acpi/osl.c

+3 −4
Original line number Diff line number Diff line
@@ -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)

drivers/acpi/power.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/acpi/processor_idle.c

+1 −2
Original line number Diff line number Diff line
@@ -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();

}