ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h

-1

drivers/acpi/ac.c

··· 37 37 #include <acpi/acpi_bus.h> 38 38 #include <acpi/acpi_drivers.h> 39 39 40 - #define ACPI_AC_COMPONENT 0x00020000 41 40 #define ACPI_AC_CLASS "ac_adapter" 42 41 #define ACPI_AC_DEVICE_NAME "AC Adapter" 43 42 #define ACPI_AC_FILE_STATE "state"

-1

drivers/acpi/acpi_memhotplug.c

··· 32 32 #include <linux/memory_hotplug.h> 33 33 #include <acpi/acpi_drivers.h> 34 34 35 - #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL 36 35 #define ACPI_MEMORY_DEVICE_CLASS "memory" 37 36 #define ACPI_MEMORY_DEVICE_HID "PNP0C80" 38 37 #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device"

-1

drivers/acpi/battery.c

··· 46 46 47 47 #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF 48 48 49 - #define ACPI_BATTERY_COMPONENT 0x00040000 50 49 #define ACPI_BATTERY_CLASS "battery" 51 50 #define ACPI_BATTERY_DEVICE_NAME "Battery" 52 51 #define ACPI_BATTERY_NOTIFY_STATUS 0x80

-1

drivers/acpi/button.c

··· 33 33 #include <acpi/acpi_bus.h> 34 34 #include <acpi/acpi_drivers.h> 35 35 36 - #define ACPI_BUTTON_COMPONENT 0x00080000 37 36 #define ACPI_BUTTON_CLASS "button" 38 37 #define ACPI_BUTTON_FILE_INFO "info" 39 38 #define ACPI_BUTTON_FILE_STATE "state"

-1

drivers/acpi/cm_sbs.c

··· 34 34 ACPI_MODULE_NAME("cm_sbs"); 35 35 #define ACPI_AC_CLASS "ac_adapter" 36 36 #define ACPI_BATTERY_CLASS "battery" 37 - #define ACPI_SBS_COMPONENT 0x00080000 38 37 #define _COMPONENT ACPI_SBS_COMPONENT 39 38 static struct proc_dir_entry *acpi_ac_dir; 40 39 static struct proc_dir_entry *acpi_battery_dir;

-1

drivers/acpi/container.c

··· 41 41 #define INSTALL_NOTIFY_HANDLER 1 42 42 #define UNINSTALL_NOTIFY_HANDLER 2 43 43 44 - #define ACPI_CONTAINER_COMPONENT 0x01000000 45 44 #define _COMPONENT ACPI_CONTAINER_COMPONENT 46 45 ACPI_MODULE_NAME("container"); 47 46

-1

drivers/acpi/fan.c

··· 34 34 #include <acpi/acpi_bus.h> 35 35 #include <acpi/acpi_drivers.h> 36 36 37 - #define ACPI_FAN_COMPONENT 0x00200000 38 37 #define ACPI_FAN_CLASS "fan" 39 38 #define ACPI_FAN_FILE_STATE "state" 40 39

+1 -2

drivers/acpi/power.c

··· 44 44 #include <acpi/acpi_bus.h> 45 45 #include <acpi/acpi_drivers.h> 46 46 47 - #define _COMPONENT ACPI_POWER_COMPONENT 47 + #define _COMPONENT ACPI_POWER_COMPONENT 48 48 ACPI_MODULE_NAME("power"); 49 - #define ACPI_POWER_COMPONENT 0x00800000 50 49 #define ACPI_POWER_CLASS "power_resource" 51 50 #define ACPI_POWER_DEVICE_NAME "Power Resource" 52 51 #define ACPI_POWER_FILE_INFO "info"

-1

drivers/acpi/processor_core.c

··· 59 59 #include <acpi/acpi_drivers.h> 60 60 #include <acpi/processor.h> 61 61 62 - #define ACPI_PROCESSOR_COMPONENT 0x01000000 63 62 #define ACPI_PROCESSOR_CLASS "processor" 64 63 #define ACPI_PROCESSOR_DEVICE_NAME "Processor" 65 64 #define ACPI_PROCESSOR_FILE_INFO "info"

-1

drivers/acpi/processor_idle.c

··· 59 59 #include <acpi/processor.h> 60 60 #include <asm/processor.h> 61 61 62 - #define ACPI_PROCESSOR_COMPONENT 0x01000000 63 62 #define ACPI_PROCESSOR_CLASS "processor" 64 63 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 65 64 ACPI_MODULE_NAME("processor_idle");

+1 -1

drivers/acpi/processor_perflib.c

··· 44 44 #endif 45 45 46 46 #include <acpi/acpi_bus.h> 47 + #include <acpi/acpi_drivers.h> 47 48 #include <acpi/processor.h> 48 49 49 - #define ACPI_PROCESSOR_COMPONENT 0x01000000 50 50 #define ACPI_PROCESSOR_CLASS "processor" 51 51 #define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" 52 52 #define _COMPONENT ACPI_PROCESSOR_COMPONENT

-1

drivers/acpi/processor_thermal.c

··· 40 40 #include <acpi/processor.h> 41 41 #include <acpi/acpi_drivers.h> 42 42 43 - #define ACPI_PROCESSOR_COMPONENT 0x01000000 44 43 #define ACPI_PROCESSOR_CLASS "processor" 45 44 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 46 45 ACPI_MODULE_NAME("processor_thermal");

+1 -1

drivers/acpi/processor_throttling.c

··· 38 38 #include <asm/uaccess.h> 39 39 40 40 #include <acpi/acpi_bus.h> 41 + #include <acpi/acpi_drivers.h> 41 42 #include <acpi/processor.h> 42 43 43 - #define ACPI_PROCESSOR_COMPONENT 0x01000000 44 44 #define ACPI_PROCESSOR_CLASS "processor" 45 45 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 46 46 ACPI_MODULE_NAME("processor_throttling");

-1

drivers/acpi/thermal.c

··· 47 47 #include <acpi/acpi_bus.h> 48 48 #include <acpi/acpi_drivers.h> 49 49 50 - #define ACPI_THERMAL_COMPONENT 0x04000000 51 50 #define ACPI_THERMAL_CLASS "thermal_zone" 52 51 #define ACPI_THERMAL_DEVICE_NAME "Thermal Zone" 53 52 #define ACPI_THERMAL_FILE_STATE "state"

-1

drivers/acpi/video.c

··· 41 41 #include <acpi/acpi_bus.h> 42 42 #include <acpi/acpi_drivers.h> 43 43 44 - #define ACPI_VIDEO_COMPONENT 0x08000000 45 44 #define ACPI_VIDEO_CLASS "video" 46 45 #define ACPI_VIDEO_BUS_NAME "Video Bus" 47 46 #define ACPI_VIDEO_DEVICE_NAME "Video Device"

+12 -1

include/acpi/acpi_drivers.h

··· 32 32 #define ACPI_MAX_STRING 80 33 33 34 34 #define ACPI_BUS_COMPONENT 0x00010000 35 + #define ACPI_AC_COMPONENT 0x00020000 36 + #define ACPI_BATTERY_COMPONENT 0x00040000 37 + #define ACPI_BUTTON_COMPONENT 0x00080000 38 + #define ACPI_SBS_COMPONENT 0x00080000 39 + #define ACPI_FAN_COMPONENT 0x00200000 40 + #define ACPI_PCI_COMPONENT 0x00400000 41 + #define ACPI_POWER_COMPONENT 0x00800000 42 + #define ACPI_CONTAINER_COMPONENT 0x01000000 43 + #define ACPI_PROCESSOR_COMPONENT 0x01000000 35 44 #define ACPI_SYSTEM_COMPONENT 0x02000000 45 + #define ACPI_THERMAL_COMPONENT 0x04000000 46 + #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000 47 + #define ACPI_VIDEO_COMPONENT 0x08000000 36 48 37 49 /* 38 50 * _HID definitions ··· 66 54 PCI 67 55 -------------------------------------------------------------------------- */ 68 56 69 - #define ACPI_PCI_COMPONENT 0x00400000 70 57 71 58 /* ACPI PCI Interrupt Link (pci_link.c) */ 72 59