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

Commit 5ba8b1c6 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Len Brown
Browse files

ACPI: remove dead code 



Found by running make namespacecheck on linux-next

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3a2468d0

drivers/acpi/osl.c

+0 −25
Original line number Diff line number Diff line
@@ -779,16 +779,6 @@ void acpi_os_wait_events_complete(void *context) 


EXPORT_SYMBOL(acpi_os_wait_events_complete);



/*

 * Allocate the memory for a spinlock and initialize it.

 */

acpi_status acpi_os_create_lock(acpi_spinlock * handle)

{

	spin_lock_init(*handle);



	return AE_OK;

}



/*

 * Deallocate the memory for a spinlock.

 */
@@ -1152,21 +1142,6 @@ int acpi_check_region(resource_size_t start, resource_size_t n, 
}

EXPORT_SYMBOL(acpi_check_region);



int acpi_check_mem_region(resource_size_t start, resource_size_t n,

		      const char *name)

{

	struct resource res = {

		.start = start,

		.end   = start + n - 1,

		.name  = name,

		.flags = IORESOURCE_MEM,

	};



	return acpi_check_resource_conflict(&res);



}

EXPORT_SYMBOL(acpi_check_mem_region);



/*

 * Let drivers know whether the resource checks are effective

 */

drivers/acpi/processor_driver.c

+0 −2
Original line number Diff line number Diff line
@@ -899,6 +899,4 @@ static void __exit acpi_processor_exit(void) 
module_init(acpi_processor_init);

module_exit(acpi_processor_exit);



EXPORT_SYMBOL(acpi_processor_set_thermal_limit);



MODULE_ALIAS("processor");

drivers/acpi/processor_thermal.c

+0 −107
Original line number Diff line number Diff line
@@ -238,113 +238,6 @@ static int acpi_thermal_cpufreq_decrease(unsigned int cpu) 


#endif



int acpi_processor_set_thermal_limit(acpi_handle handle, int type)

{

	int result = 0;

	struct acpi_processor *pr = NULL;

	struct acpi_device *device = NULL;

	int tx = 0, max_tx_px = 0;





	if ((type < ACPI_PROCESSOR_LIMIT_NONE)

	    || (type > ACPI_PROCESSOR_LIMIT_DECREMENT))

		return -EINVAL;



	result = acpi_bus_get_device(handle, &device);

	if (result)

		return result;



	pr = acpi_driver_data(device);

	if (!pr)

		return -ENODEV;



	/* Thermal limits are always relative to the current Px/Tx state. */

	if (pr->flags.throttling)

		pr->limit.thermal.tx = pr->throttling.state;



	/*

	 * Our default policy is to only use throttling at the lowest

	 * performance state.

	 */



	tx = pr->limit.thermal.tx;



	switch (type) {



	case ACPI_PROCESSOR_LIMIT_NONE:

		do {

			result = acpi_thermal_cpufreq_decrease(pr->id);

		} while (!result);

		tx = 0;

		break;



	case ACPI_PROCESSOR_LIMIT_INCREMENT:

		/* if going up: P-states first, T-states later */



		result = acpi_thermal_cpufreq_increase(pr->id);

		if (!result)

			goto end;

		else if (result == -ERANGE)

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "At maximum performance state\n"));



		if (pr->flags.throttling) {

			if (tx == (pr->throttling.state_count - 1))

				ACPI_DEBUG_PRINT((ACPI_DB_INFO,

						  "At maximum throttling state\n"));

			else

				tx++;

		}

		break;



	case ACPI_PROCESSOR_LIMIT_DECREMENT:

		/* if going down: T-states first, P-states later */



		if (pr->flags.throttling) {

			if (tx == 0) {

				max_tx_px = 1;

				ACPI_DEBUG_PRINT((ACPI_DB_INFO,

						  "At minimum throttling state\n"));

			} else {

				tx--;

				goto end;

			}

		}



		result = acpi_thermal_cpufreq_decrease(pr->id);

		if (result) {

			/*

			 * We only could get -ERANGE, 1 or 0.

			 * In the first two cases we reached max freq again.

			 */

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "At minimum performance state\n"));

			max_tx_px = 1;

		} else

			max_tx_px = 0;



		break;

	}



      end:

	if (pr->flags.throttling) {

		pr->limit.thermal.px = 0;

		pr->limit.thermal.tx = tx;



		result = acpi_processor_apply_limit(pr);

		if (result)

			printk(KERN_ERR PREFIX "Unable to set thermal limit\n");



		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n",

				  pr->limit.thermal.px, pr->limit.thermal.tx));

	} else

		result = 0;

	if (max_tx_px)

		return 1;

	else

		return result;

}



int acpi_processor_get_limit_info(struct acpi_processor *pr)

{

include/acpi/acpi_drivers.h

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ void pci_acpi_crs_quirks(void); 
#define ACPI_PROCESSOR_LIMIT_INCREMENT	0x01

#define ACPI_PROCESSOR_LIMIT_DECREMENT	0x02



int acpi_processor_set_thermal_limit(acpi_handle handle, int type);



/*--------------------------------------------------------------------------

                                  Dock Station

  -------------------------------------------------------------------------- */

include/acpi/acpiosxf.h

+0 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ acpi_os_table_override(struct acpi_table_header *existing_table, 
/*

 * Spinlock primitives

 */

acpi_status acpi_os_create_lock(acpi_spinlock * out_handle);



void acpi_os_delete_lock(acpi_spinlock handle);



acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock handle);