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

ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h 



Move all the component definitions for drivers to a single shared place,
include/acpi/acpi_drivers.h.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 14a63ba8

drivers/acpi/ac.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>



#define ACPI_AC_COMPONENT		0x00020000

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"

drivers/acpi/acpi_memhotplug.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/memory_hotplug.h>

#include <acpi/acpi_drivers.h>



#define ACPI_MEMORY_DEVICE_COMPONENT		0x08000000UL

#define ACPI_MEMORY_DEVICE_CLASS		"memory"

#define ACPI_MEMORY_DEVICE_HID			"PNP0C80"

#define ACPI_MEMORY_DEVICE_NAME			"Hotplug Mem Device"

drivers/acpi/battery.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF



#define ACPI_BATTERY_COMPONENT		0x00040000

#define ACPI_BATTERY_CLASS		"battery"

#define ACPI_BATTERY_DEVICE_NAME	"Battery"

#define ACPI_BATTERY_NOTIFY_STATUS	0x80

drivers/acpi/button.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>



#define ACPI_BUTTON_COMPONENT		0x00080000

#define ACPI_BUTTON_CLASS		"button"

#define ACPI_BUTTON_FILE_INFO		"info"

#define ACPI_BUTTON_FILE_STATE		"state"

drivers/acpi/cm_sbs.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
ACPI_MODULE_NAME("cm_sbs");

#define ACPI_AC_CLASS		"ac_adapter"

#define ACPI_BATTERY_CLASS	"battery"

#define ACPI_SBS_COMPONENT	0x00080000

#define _COMPONENT		ACPI_SBS_COMPONENT

static struct proc_dir_entry *acpi_ac_dir;

static struct proc_dir_entry *acpi_battery_dir;

CRA Git | Maintained and supported by SUSTech CRA and CCSE