ACPI: delete extra #defines in /drivers/acpi/ drivers
Cosmetic only. Except in a single case, #define ACPI_*_DRIVER_NAME were invoked 0 or 1 times. Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
c2b6705b75
commit
7cda93e008
|
@ -35,7 +35,6 @@
|
|||
#define ACPI_AC_COMPONENT 0x00020000
|
||||
#define ACPI_AC_CLASS "ac_adapter"
|
||||
#define ACPI_AC_HID "ACPI0003"
|
||||
#define ACPI_AC_DRIVER_NAME "ACPI AC Adapter Driver"
|
||||
#define ACPI_AC_DEVICE_NAME "AC Adapter"
|
||||
#define ACPI_AC_FILE_STATE "state"
|
||||
#define ACPI_AC_NOTIFY_STATUS 0x80
|
||||
|
@ -47,7 +46,7 @@
|
|||
ACPI_MODULE_NAME("ac");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI AC Adapter Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
extern struct proc_dir_entry *acpi_lock_ac_dir(void);
|
||||
|
|
|
@ -35,14 +35,13 @@
|
|||
#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL
|
||||
#define ACPI_MEMORY_DEVICE_CLASS "memory"
|
||||
#define ACPI_MEMORY_DEVICE_HID "PNP0C80"
|
||||
#define ACPI_MEMORY_DEVICE_DRIVER_NAME "Hotplug Mem Driver"
|
||||
#define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device"
|
||||
|
||||
#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT
|
||||
|
||||
ACPI_MODULE_NAME("acpi_memhotplug");
|
||||
MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
|
||||
MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("Hotplug Mem Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
/* ACPI _STA method values */
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
#define ACPI_BATTERY_COMPONENT 0x00040000
|
||||
#define ACPI_BATTERY_CLASS "battery"
|
||||
#define ACPI_BATTERY_HID "PNP0C0A"
|
||||
#define ACPI_BATTERY_DRIVER_NAME "ACPI Battery Driver"
|
||||
#define ACPI_BATTERY_DEVICE_NAME "Battery"
|
||||
#define ACPI_BATTERY_FILE_INFO "info"
|
||||
#define ACPI_BATTERY_FILE_STATUS "state"
|
||||
|
@ -56,7 +55,7 @@
|
|||
ACPI_MODULE_NAME("battery");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Battery Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
extern struct proc_dir_entry *acpi_lock_battery_dir(void);
|
||||
|
|
|
@ -32,11 +32,9 @@
|
|||
#include <asm/uaccess.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver"
|
||||
|
||||
ACPI_MODULE_NAME("bay");
|
||||
MODULE_AUTHOR("Kristen Carlson Accardi");
|
||||
MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Removable Drive Bay Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
#define ACPI_BAY_CLASS "bay"
|
||||
#define ACPI_BAY_COMPONENT 0x10000000
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
#define ACPI_BUTTON_COMPONENT 0x00080000
|
||||
#define ACPI_BUTTON_DRIVER_NAME "ACPI Button Driver"
|
||||
#define ACPI_BUTTON_CLASS "button"
|
||||
#define ACPI_BUTTON_FILE_INFO "info"
|
||||
#define ACPI_BUTTON_FILE_STATE "state"
|
||||
|
@ -64,7 +63,7 @@
|
|||
ACPI_MODULE_NAME("button");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Button Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int acpi_button_add(struct acpi_device *device);
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
#include <acpi/acpi_drivers.h>
|
||||
#include <acpi/container.h>
|
||||
|
||||
#define ACPI_CONTAINER_DRIVER_NAME "ACPI container driver"
|
||||
#define ACPI_CONTAINER_DEVICE_NAME "ACPI container device"
|
||||
#define ACPI_CONTAINER_CLASS "container"
|
||||
|
||||
|
@ -47,7 +46,7 @@
|
|||
ACPI_MODULE_NAME("container");
|
||||
|
||||
MODULE_AUTHOR("Anil S Keshavamurthy");
|
||||
MODULE_DESCRIPTION(ACPI_CONTAINER_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI container driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#define ACPI_STA_PRESENT (0x00000001)
|
||||
|
|
|
@ -32,11 +32,11 @@
|
|||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
#define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver"
|
||||
#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
|
||||
|
||||
ACPI_MODULE_NAME("dock");
|
||||
MODULE_AUTHOR("Kristen Carlson Accardi");
|
||||
MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static struct atomic_notifier_head dock_notifier_list;
|
||||
|
@ -741,7 +741,7 @@ static int dock_add(acpi_handle handle)
|
|||
goto dock_add_err;
|
||||
}
|
||||
|
||||
printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_NAME);
|
||||
printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_DESCRIPTION);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ ACPI_MODULE_NAME("ec");
|
|||
#define ACPI_EC_COMPONENT 0x00100000
|
||||
#define ACPI_EC_CLASS "embedded_controller"
|
||||
#define ACPI_EC_HID "PNP0C09"
|
||||
#define ACPI_EC_DRIVER_NAME "ACPI Embedded Controller Driver"
|
||||
#define ACPI_EC_DEVICE_NAME "Embedded Controller"
|
||||
#define ACPI_EC_FILE_INFO "info"
|
||||
#undef PREFIX
|
||||
|
|
|
@ -36,14 +36,13 @@
|
|||
|
||||
#define ACPI_FAN_COMPONENT 0x00200000
|
||||
#define ACPI_FAN_CLASS "fan"
|
||||
#define ACPI_FAN_DRIVER_NAME "ACPI Fan Driver"
|
||||
#define ACPI_FAN_FILE_STATE "state"
|
||||
|
||||
#define _COMPONENT ACPI_FAN_COMPONENT
|
||||
ACPI_MODULE_NAME("fan");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Fan Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int acpi_fan_add(struct acpi_device *device);
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#define ACPI_EC_HC_COMPONENT 0x00080000
|
||||
#define ACPI_EC_HC_CLASS "ec_hc_smbus"
|
||||
#define ACPI_EC_HC_HID "ACPI0001"
|
||||
#define ACPI_EC_HC_DRIVER_NAME "ACPI EC HC smbus driver"
|
||||
#define ACPI_EC_HC_DEVICE_NAME "EC HC smbus"
|
||||
|
||||
#define _COMPONENT ACPI_EC_HC_COMPONENT
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
ACPI_MODULE_NAME("pci_link");
|
||||
#define ACPI_PCI_LINK_CLASS "pci_irq_routing"
|
||||
#define ACPI_PCI_LINK_HID "PNP0C0F"
|
||||
#define ACPI_PCI_LINK_DRIVER_NAME "ACPI PCI Interrupt Link Driver"
|
||||
#define ACPI_PCI_LINK_DEVICE_NAME "PCI Interrupt Link"
|
||||
#define ACPI_PCI_LINK_FILE_INFO "info"
|
||||
#define ACPI_PCI_LINK_FILE_STATUS "state"
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
ACPI_MODULE_NAME("pci_root");
|
||||
#define ACPI_PCI_ROOT_CLASS "pci_bridge"
|
||||
#define ACPI_PCI_ROOT_HID "PNP0A03"
|
||||
#define ACPI_PCI_ROOT_DRIVER_NAME "ACPI PCI Root Bridge Driver"
|
||||
#define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge"
|
||||
static int acpi_pci_root_add(struct acpi_device *device);
|
||||
static int acpi_pci_root_remove(struct acpi_device *device, int type);
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
ACPI_MODULE_NAME("power");
|
||||
#define ACPI_POWER_COMPONENT 0x00800000
|
||||
#define ACPI_POWER_CLASS "power_resource"
|
||||
#define ACPI_POWER_DRIVER_NAME "ACPI Power Resource Driver"
|
||||
#define ACPI_POWER_DEVICE_NAME "Power Resource"
|
||||
#define ACPI_POWER_FILE_INFO "info"
|
||||
#define ACPI_POWER_FILE_STATUS "state"
|
||||
|
|
|
@ -60,7 +60,6 @@
|
|||
|
||||
#define ACPI_PROCESSOR_COMPONENT 0x01000000
|
||||
#define ACPI_PROCESSOR_CLASS "processor"
|
||||
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
|
||||
#define ACPI_PROCESSOR_DEVICE_NAME "Processor"
|
||||
#define ACPI_PROCESSOR_FILE_INFO "info"
|
||||
#define ACPI_PROCESSOR_FILE_THROTTLING "throttling"
|
||||
|
@ -77,7 +76,7 @@
|
|||
ACPI_MODULE_NAME("processor_core");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Processor Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int acpi_processor_add(struct acpi_device *device);
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
|
||||
#define ACPI_PROCESSOR_COMPONENT 0x01000000
|
||||
#define ACPI_PROCESSOR_CLASS "processor"
|
||||
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
|
||||
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
||||
ACPI_MODULE_NAME("processor_idle");
|
||||
#define ACPI_PROCESSOR_FILE_POWER "power"
|
||||
|
|
|
@ -44,7 +44,6 @@
|
|||
|
||||
#define ACPI_PROCESSOR_COMPONENT 0x01000000
|
||||
#define ACPI_PROCESSOR_CLASS "processor"
|
||||
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
|
||||
#define ACPI_PROCESSOR_FILE_PERFORMANCE "performance"
|
||||
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
||||
ACPI_MODULE_NAME("processor_perflib");
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#define ACPI_PROCESSOR_COMPONENT 0x01000000
|
||||
#define ACPI_PROCESSOR_CLASS "processor"
|
||||
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
|
||||
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
||||
ACPI_MODULE_NAME("processor_thermal");
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#define ACPI_PROCESSOR_COMPONENT 0x01000000
|
||||
#define ACPI_PROCESSOR_CLASS "processor"
|
||||
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
|
||||
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
||||
ACPI_MODULE_NAME("processor_throttling");
|
||||
|
||||
|
|
|
@ -59,7 +59,6 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
|
|||
#define ACPI_AC_CLASS "ac_adapter"
|
||||
#define ACPI_BATTERY_CLASS "battery"
|
||||
#define ACPI_SBS_HID "ACPI0002"
|
||||
#define ACPI_SBS_DRIVER_NAME "ACPI Smart Battery System Driver"
|
||||
#define ACPI_SBS_DEVICE_NAME "Smart Battery System"
|
||||
#define ACPI_SBS_FILE_INFO "info"
|
||||
#define ACPI_SBS_FILE_STATE "state"
|
||||
|
|
|
@ -17,7 +17,6 @@ extern struct acpi_device *acpi_root;
|
|||
|
||||
#define ACPI_BUS_CLASS "system_bus"
|
||||
#define ACPI_BUS_HID "ACPI_BUS"
|
||||
#define ACPI_BUS_DRIVER_NAME "ACPI Bus Driver"
|
||||
#define ACPI_BUS_DEVICE_NAME "System Bus"
|
||||
|
||||
static LIST_HEAD(acpi_device_list);
|
||||
|
|
|
@ -38,7 +38,6 @@ ACPI_MODULE_NAME("system");
|
|||
#define MODULE_PARAM_PREFIX "acpi."
|
||||
|
||||
#define ACPI_SYSTEM_CLASS "system"
|
||||
#define ACPI_SYSTEM_DRIVER_NAME "ACPI System Driver"
|
||||
#define ACPI_SYSTEM_DEVICE_NAME "System"
|
||||
#define ACPI_SYSTEM_FILE_INFO "info"
|
||||
#define ACPI_SYSTEM_FILE_EVENT "event"
|
||||
|
|
|
@ -46,7 +46,6 @@
|
|||
|
||||
#define ACPI_THERMAL_COMPONENT 0x04000000
|
||||
#define ACPI_THERMAL_CLASS "thermal_zone"
|
||||
#define ACPI_THERMAL_DRIVER_NAME "ACPI Thermal Zone Driver"
|
||||
#define ACPI_THERMAL_DEVICE_NAME "Thermal Zone"
|
||||
#define ACPI_THERMAL_FILE_STATE "state"
|
||||
#define ACPI_THERMAL_FILE_TEMPERATURE "temperature"
|
||||
|
@ -73,7 +72,7 @@
|
|||
ACPI_MODULE_NAME("thermal");
|
||||
|
||||
MODULE_AUTHOR("Paul Diefenbaugh");
|
||||
MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Thermal Zone Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int tzp;
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
|
||||
#define ACPI_VIDEO_COMPONENT 0x08000000
|
||||
#define ACPI_VIDEO_CLASS "video"
|
||||
#define ACPI_VIDEO_DRIVER_NAME "ACPI Video Driver"
|
||||
#define ACPI_VIDEO_BUS_NAME "Video Bus"
|
||||
#define ACPI_VIDEO_DEVICE_NAME "Video Device"
|
||||
#define ACPI_VIDEO_NOTIFY_SWITCH 0x80
|
||||
|
@ -68,7 +67,7 @@
|
|||
ACPI_MODULE_NAME("video");
|
||||
|
||||
MODULE_AUTHOR("Bruno Ducrot");
|
||||
MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME);
|
||||
MODULE_DESCRIPTION("ACPI Video Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int acpi_video_bus_add(struct acpi_device *device);
|
||||
|
|
Loading…
Reference in New Issue