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

Commit a0bd4ac4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: Remove duplicate definitions for _STA bits 



No need to duplicate the existing definitions in include/acpi/actypes.h.

syntax only -- no functional change.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d8938801

drivers/acpi/acpi_memhotplug.c

+4 −9
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); 
MODULE_DESCRIPTION("Hotplug Mem Driver");

MODULE_LICENSE("GPL");



/* ACPI _STA method values */

#define ACPI_MEMORY_STA_PRESENT		(0x00000001UL)

#define ACPI_MEMORY_STA_ENABLED		(0x00000002UL)

#define ACPI_MEMORY_STA_FUNCTIONAL	(0x00000008UL)



/* Memory Device States */

#define MEMORY_INVALID_STATE	0

#define MEMORY_POWER_ON_STATE	1
@@ -204,9 +199,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device) 
	 * Check for device status. Device should be

	 * present/enabled/functioning.

	 */

	if (!((current_status & ACPI_MEMORY_STA_PRESENT)

	      && (current_status & ACPI_MEMORY_STA_ENABLED)

	      && (current_status & ACPI_MEMORY_STA_FUNCTIONAL)))

	if (!((current_status & ACPI_STA_DEVICE_PRESENT)

	      && (current_status & ACPI_STA_DEVICE_ENABLED)

	      && (current_status & ACPI_STA_DEVICE_FUNCTIONING)))

		return -ENODEV;



	return 0;
@@ -286,7 +281,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device) 
		return -ENODEV;



	/* Check for device status.  Device should be disabled */

	if (current_status & ACPI_MEMORY_STA_ENABLED)

	if (current_status & ACPI_STA_DEVICE_ENABLED)

		return -EINVAL;



	return 0;

drivers/acpi/container.c

+2 −4
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ MODULE_AUTHOR("Anil S Keshavamurthy"); 
MODULE_DESCRIPTION("ACPI container driver");

MODULE_LICENSE("GPL");



#define ACPI_STA_PRESENT		(0x00000001)



static int acpi_container_add(struct acpi_device *device);

static int acpi_container_remove(struct acpi_device *device, int type);
@@ -75,13 +73,13 @@ static int is_device_present(acpi_handle handle) 


	status = acpi_get_handle(handle, "_STA", &temp);

	if (ACPI_FAILURE(status))

		return 1;	/* _STA not found, assmue device present */

		return 1;	/* _STA not found, assume device present */



	status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);

	if (ACPI_FAILURE(status))

		return 0;	/* Firmware error */



	return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT);

	return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);

}



/*******************************************************************/

drivers/acpi/processor_core.c

+1 −3
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ 
#define ACPI_PROCESSOR_LIMIT_USER	0

#define ACPI_PROCESSOR_LIMIT_THERMAL	1



#define ACPI_STA_PRESENT 0x00000001



#define _COMPONENT		ACPI_PROCESSOR_COMPONENT

ACPI_MODULE_NAME("processor_core");
@@ -779,7 +777,7 @@ static int is_processor_present(acpi_handle handle) 




	status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);

	if (ACPI_FAILURE(status) || !(sta & ACPI_STA_PRESENT)) {

	if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_PRESENT)) {

		ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));

		return 0;

	}