diff options
author | Len Brown <len.brown@intel.com> | 2007-02-12 23:50:02 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-12 23:50:52 -0500 |
commit | 7cda93e008e1a477970adbf82dba81a5d4f0ae40 (patch) | |
tree | 7127b8e20ed4725eb890b5731ca80f2beb585da4 /drivers/acpi | |
parent | c2b6705b75d9c7aff98a4602a32230639e10891c (diff) |
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/ac.c | 3 | ||||
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 3 | ||||
-rw-r--r-- | drivers/acpi/battery.c | 3 | ||||
-rw-r--r-- | drivers/acpi/bay.c | 4 | ||||
-rw-r--r-- | drivers/acpi/button.c | 3 | ||||
-rw-r--r-- | drivers/acpi/container.c | 3 | ||||
-rw-r--r-- | drivers/acpi/dock.c | 6 | ||||
-rw-r--r-- | drivers/acpi/ec.c | 1 | ||||
-rw-r--r-- | drivers/acpi/fan.c | 3 | ||||
-rw-r--r-- | drivers/acpi/i2c_ec.c | 1 | ||||
-rw-r--r-- | drivers/acpi/pci_link.c | 1 | ||||
-rw-r--r-- | drivers/acpi/pci_root.c | 1 | ||||
-rw-r--r-- | drivers/acpi/power.c | 1 | ||||
-rw-r--r-- | drivers/acpi/processor_core.c | 3 | ||||
-rw-r--r-- | drivers/acpi/processor_idle.c | 1 | ||||
-rw-r--r-- | drivers/acpi/processor_perflib.c | 1 | ||||
-rw-r--r-- | drivers/acpi/processor_thermal.c | 1 | ||||
-rw-r--r-- | drivers/acpi/processor_throttling.c | 1 | ||||
-rw-r--r-- | drivers/acpi/sbs.c | 1 | ||||
-rw-r--r-- | drivers/acpi/scan.c | 1 | ||||
-rw-r--r-- | drivers/acpi/system.c | 1 | ||||
-rw-r--r-- | drivers/acpi/thermal.c | 3 | ||||
-rw-r--r-- | drivers/acpi/video.c | 3 |
23 files changed, 13 insertions, 36 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 17eef27b9ce2..37c7dc4f9fe5 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #define ACPI_AC_COMPONENT 0x00020000 | 35 | #define ACPI_AC_COMPONENT 0x00020000 |
36 | #define ACPI_AC_CLASS "ac_adapter" | 36 | #define ACPI_AC_CLASS "ac_adapter" |
37 | #define ACPI_AC_HID "ACPI0003" | 37 | #define ACPI_AC_HID "ACPI0003" |
38 | #define ACPI_AC_DRIVER_NAME "ACPI AC Adapter Driver" | ||
39 | #define ACPI_AC_DEVICE_NAME "AC Adapter" | 38 | #define ACPI_AC_DEVICE_NAME "AC Adapter" |
40 | #define ACPI_AC_FILE_STATE "state" | 39 | #define ACPI_AC_FILE_STATE "state" |
41 | #define ACPI_AC_NOTIFY_STATUS 0x80 | 40 | #define ACPI_AC_NOTIFY_STATUS 0x80 |
@@ -47,7 +46,7 @@ | |||
47 | ACPI_MODULE_NAME("ac"); | 46 | ACPI_MODULE_NAME("ac"); |
48 | 47 | ||
49 | MODULE_AUTHOR("Paul Diefenbaugh"); | 48 | MODULE_AUTHOR("Paul Diefenbaugh"); |
50 | MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME); | 49 | MODULE_DESCRIPTION("ACPI AC Adapter Driver"); |
51 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
52 | 51 | ||
53 | extern struct proc_dir_entry *acpi_lock_ac_dir(void); | 52 | extern struct proc_dir_entry *acpi_lock_ac_dir(void); |
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index d677130f9898..c26172671fd8 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
@@ -35,14 +35,13 @@ | |||
35 | #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL | 35 | #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL |
36 | #define ACPI_MEMORY_DEVICE_CLASS "memory" | 36 | #define ACPI_MEMORY_DEVICE_CLASS "memory" |
37 | #define ACPI_MEMORY_DEVICE_HID "PNP0C80" | 37 | #define ACPI_MEMORY_DEVICE_HID "PNP0C80" |
38 | #define ACPI_MEMORY_DEVICE_DRIVER_NAME "Hotplug Mem Driver" | ||
39 | #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" | 38 | #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" |
40 | 39 | ||
41 | #define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT | 40 | #define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT |
42 | 41 | ||
43 | ACPI_MODULE_NAME("acpi_memhotplug"); | 42 | ACPI_MODULE_NAME("acpi_memhotplug"); |
44 | MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); | 43 | MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); |
45 | MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME); | 44 | MODULE_DESCRIPTION("Hotplug Mem Driver"); |
46 | MODULE_LICENSE("GPL"); | 45 | MODULE_LICENSE("GPL"); |
47 | 46 | ||
48 | /* ACPI _STA method values */ | 47 | /* ACPI _STA method values */ |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index da29d9d61c34..02de49ef1bce 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #define ACPI_BATTERY_COMPONENT 0x00040000 | 42 | #define ACPI_BATTERY_COMPONENT 0x00040000 |
43 | #define ACPI_BATTERY_CLASS "battery" | 43 | #define ACPI_BATTERY_CLASS "battery" |
44 | #define ACPI_BATTERY_HID "PNP0C0A" | 44 | #define ACPI_BATTERY_HID "PNP0C0A" |
45 | #define ACPI_BATTERY_DRIVER_NAME "ACPI Battery Driver" | ||
46 | #define ACPI_BATTERY_DEVICE_NAME "Battery" | 45 | #define ACPI_BATTERY_DEVICE_NAME "Battery" |
47 | #define ACPI_BATTERY_FILE_INFO "info" | 46 | #define ACPI_BATTERY_FILE_INFO "info" |
48 | #define ACPI_BATTERY_FILE_STATUS "state" | 47 | #define ACPI_BATTERY_FILE_STATUS "state" |
@@ -56,7 +55,7 @@ | |||
56 | ACPI_MODULE_NAME("battery"); | 55 | ACPI_MODULE_NAME("battery"); |
57 | 56 | ||
58 | MODULE_AUTHOR("Paul Diefenbaugh"); | 57 | MODULE_AUTHOR("Paul Diefenbaugh"); |
59 | MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME); | 58 | MODULE_DESCRIPTION("ACPI Battery Driver"); |
60 | MODULE_LICENSE("GPL"); | 59 | MODULE_LICENSE("GPL"); |
61 | 60 | ||
62 | extern struct proc_dir_entry *acpi_lock_battery_dir(void); | 61 | extern struct proc_dir_entry *acpi_lock_battery_dir(void); |
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 1f88858eb603..36dcb899b23c 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
@@ -32,11 +32,9 @@ | |||
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
34 | 34 | ||
35 | #define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver" | ||
36 | |||
37 | ACPI_MODULE_NAME("bay"); | 35 | ACPI_MODULE_NAME("bay"); |
38 | MODULE_AUTHOR("Kristen Carlson Accardi"); | 36 | MODULE_AUTHOR("Kristen Carlson Accardi"); |
39 | MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME); | 37 | MODULE_DESCRIPTION("ACPI Removable Drive Bay Driver"); |
40 | MODULE_LICENSE("GPL"); | 38 | MODULE_LICENSE("GPL"); |
41 | #define ACPI_BAY_CLASS "bay" | 39 | #define ACPI_BAY_CLASS "bay" |
42 | #define ACPI_BAY_COMPONENT 0x10000000 | 40 | #define ACPI_BAY_COMPONENT 0x10000000 |
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 45f960d4cd83..cb4110b50cd0 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <acpi/acpi_drivers.h> | 34 | #include <acpi/acpi_drivers.h> |
35 | 35 | ||
36 | #define ACPI_BUTTON_COMPONENT 0x00080000 | 36 | #define ACPI_BUTTON_COMPONENT 0x00080000 |
37 | #define ACPI_BUTTON_DRIVER_NAME "ACPI Button Driver" | ||
38 | #define ACPI_BUTTON_CLASS "button" | 37 | #define ACPI_BUTTON_CLASS "button" |
39 | #define ACPI_BUTTON_FILE_INFO "info" | 38 | #define ACPI_BUTTON_FILE_INFO "info" |
40 | #define ACPI_BUTTON_FILE_STATE "state" | 39 | #define ACPI_BUTTON_FILE_STATE "state" |
@@ -64,7 +63,7 @@ | |||
64 | ACPI_MODULE_NAME("button"); | 63 | ACPI_MODULE_NAME("button"); |
65 | 64 | ||
66 | MODULE_AUTHOR("Paul Diefenbaugh"); | 65 | MODULE_AUTHOR("Paul Diefenbaugh"); |
67 | MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME); | 66 | MODULE_DESCRIPTION("ACPI Button Driver"); |
68 | MODULE_LICENSE("GPL"); | 67 | MODULE_LICENSE("GPL"); |
69 | 68 | ||
70 | static int acpi_button_add(struct acpi_device *device); | 69 | static int acpi_button_add(struct acpi_device *device); |
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 0e36062dc1f5..0930d9413dfa 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <acpi/acpi_drivers.h> | 35 | #include <acpi/acpi_drivers.h> |
36 | #include <acpi/container.h> | 36 | #include <acpi/container.h> |
37 | 37 | ||
38 | #define ACPI_CONTAINER_DRIVER_NAME "ACPI container driver" | ||
39 | #define ACPI_CONTAINER_DEVICE_NAME "ACPI container device" | 38 | #define ACPI_CONTAINER_DEVICE_NAME "ACPI container device" |
40 | #define ACPI_CONTAINER_CLASS "container" | 39 | #define ACPI_CONTAINER_CLASS "container" |
41 | 40 | ||
@@ -47,7 +46,7 @@ | |||
47 | ACPI_MODULE_NAME("container"); | 46 | ACPI_MODULE_NAME("container"); |
48 | 47 | ||
49 | MODULE_AUTHOR("Anil S Keshavamurthy"); | 48 | MODULE_AUTHOR("Anil S Keshavamurthy"); |
50 | MODULE_DESCRIPTION(ACPI_CONTAINER_DRIVER_NAME); | 49 | MODULE_DESCRIPTION("ACPI container driver"); |
51 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
52 | 51 | ||
53 | #define ACPI_STA_PRESENT (0x00000001) | 52 | #define ACPI_STA_PRESENT (0x00000001) |
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index b3a04ff5180b..54a697f9aa18 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
@@ -32,11 +32,11 @@ | |||
32 | #include <acpi/acpi_bus.h> | 32 | #include <acpi/acpi_bus.h> |
33 | #include <acpi/acpi_drivers.h> | 33 | #include <acpi/acpi_drivers.h> |
34 | 34 | ||
35 | #define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver" | 35 | #define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver" |
36 | 36 | ||
37 | ACPI_MODULE_NAME("dock"); | 37 | ACPI_MODULE_NAME("dock"); |
38 | MODULE_AUTHOR("Kristen Carlson Accardi"); | 38 | MODULE_AUTHOR("Kristen Carlson Accardi"); |
39 | MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME); | 39 | MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION); |
40 | MODULE_LICENSE("GPL"); | 40 | MODULE_LICENSE("GPL"); |
41 | 41 | ||
42 | static struct atomic_notifier_head dock_notifier_list; | 42 | static struct atomic_notifier_head dock_notifier_list; |
@@ -741,7 +741,7 @@ static int dock_add(acpi_handle handle) | |||
741 | goto dock_add_err; | 741 | goto dock_add_err; |
742 | } | 742 | } |
743 | 743 | ||
744 | printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_NAME); | 744 | printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_DESCRIPTION); |
745 | 745 | ||
746 | return 0; | 746 | return 0; |
747 | 747 | ||
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 9d6795299af1..c1f6251a80a3 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -42,7 +42,6 @@ ACPI_MODULE_NAME("ec"); | |||
42 | #define ACPI_EC_COMPONENT 0x00100000 | 42 | #define ACPI_EC_COMPONENT 0x00100000 |
43 | #define ACPI_EC_CLASS "embedded_controller" | 43 | #define ACPI_EC_CLASS "embedded_controller" |
44 | #define ACPI_EC_HID "PNP0C09" | 44 | #define ACPI_EC_HID "PNP0C09" |
45 | #define ACPI_EC_DRIVER_NAME "ACPI Embedded Controller Driver" | ||
46 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" | 45 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" |
47 | #define ACPI_EC_FILE_INFO "info" | 46 | #define ACPI_EC_FILE_INFO "info" |
48 | #undef PREFIX | 47 | #undef PREFIX |
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 5ac727effe36..ec655c539492 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
@@ -36,14 +36,13 @@ | |||
36 | 36 | ||
37 | #define ACPI_FAN_COMPONENT 0x00200000 | 37 | #define ACPI_FAN_COMPONENT 0x00200000 |
38 | #define ACPI_FAN_CLASS "fan" | 38 | #define ACPI_FAN_CLASS "fan" |
39 | #define ACPI_FAN_DRIVER_NAME "ACPI Fan Driver" | ||
40 | #define ACPI_FAN_FILE_STATE "state" | 39 | #define ACPI_FAN_FILE_STATE "state" |
41 | 40 | ||
42 | #define _COMPONENT ACPI_FAN_COMPONENT | 41 | #define _COMPONENT ACPI_FAN_COMPONENT |
43 | ACPI_MODULE_NAME("fan"); | 42 | ACPI_MODULE_NAME("fan"); |
44 | 43 | ||
45 | MODULE_AUTHOR("Paul Diefenbaugh"); | 44 | MODULE_AUTHOR("Paul Diefenbaugh"); |
46 | MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME); | 45 | MODULE_DESCRIPTION("ACPI Fan Driver"); |
47 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
48 | 47 | ||
49 | static int acpi_fan_add(struct acpi_device *device); | 48 | static int acpi_fan_add(struct acpi_device *device); |
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c index d2fde7ab3625..a29b82793797 100644 --- a/drivers/acpi/i2c_ec.c +++ b/drivers/acpi/i2c_ec.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #define ACPI_EC_HC_COMPONENT 0x00080000 | 28 | #define ACPI_EC_HC_COMPONENT 0x00080000 |
29 | #define ACPI_EC_HC_CLASS "ec_hc_smbus" | 29 | #define ACPI_EC_HC_CLASS "ec_hc_smbus" |
30 | #define ACPI_EC_HC_HID "ACPI0001" | 30 | #define ACPI_EC_HC_HID "ACPI0001" |
31 | #define ACPI_EC_HC_DRIVER_NAME "ACPI EC HC smbus driver" | ||
32 | #define ACPI_EC_HC_DEVICE_NAME "EC HC smbus" | 31 | #define ACPI_EC_HC_DEVICE_NAME "EC HC smbus" |
33 | 32 | ||
34 | #define _COMPONENT ACPI_EC_HC_COMPONENT | 33 | #define _COMPONENT ACPI_EC_HC_COMPONENT |
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index a95f03fa03b4..acc594771379 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -47,7 +47,6 @@ | |||
47 | ACPI_MODULE_NAME("pci_link"); | 47 | ACPI_MODULE_NAME("pci_link"); |
48 | #define ACPI_PCI_LINK_CLASS "pci_irq_routing" | 48 | #define ACPI_PCI_LINK_CLASS "pci_irq_routing" |
49 | #define ACPI_PCI_LINK_HID "PNP0C0F" | 49 | #define ACPI_PCI_LINK_HID "PNP0C0F" |
50 | #define ACPI_PCI_LINK_DRIVER_NAME "ACPI PCI Interrupt Link Driver" | ||
51 | #define ACPI_PCI_LINK_DEVICE_NAME "PCI Interrupt Link" | 50 | #define ACPI_PCI_LINK_DEVICE_NAME "PCI Interrupt Link" |
52 | #define ACPI_PCI_LINK_FILE_INFO "info" | 51 | #define ACPI_PCI_LINK_FILE_INFO "info" |
53 | #define ACPI_PCI_LINK_FILE_STATUS "state" | 52 | #define ACPI_PCI_LINK_FILE_STATUS "state" |
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 7bf24c39cebf..ad4145a37786 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -39,7 +39,6 @@ | |||
39 | ACPI_MODULE_NAME("pci_root"); | 39 | ACPI_MODULE_NAME("pci_root"); |
40 | #define ACPI_PCI_ROOT_CLASS "pci_bridge" | 40 | #define ACPI_PCI_ROOT_CLASS "pci_bridge" |
41 | #define ACPI_PCI_ROOT_HID "PNP0A03" | 41 | #define ACPI_PCI_ROOT_HID "PNP0A03" |
42 | #define ACPI_PCI_ROOT_DRIVER_NAME "ACPI PCI Root Bridge Driver" | ||
43 | #define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge" | 42 | #define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge" |
44 | static int acpi_pci_root_add(struct acpi_device *device); | 43 | static int acpi_pci_root_add(struct acpi_device *device); |
45 | static int acpi_pci_root_remove(struct acpi_device *device, int type); | 44 | static int acpi_pci_root_remove(struct acpi_device *device, int type); |
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 09b855d3a928..92f80ba491c5 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
@@ -48,7 +48,6 @@ | |||
48 | ACPI_MODULE_NAME("power"); | 48 | ACPI_MODULE_NAME("power"); |
49 | #define ACPI_POWER_COMPONENT 0x00800000 | 49 | #define ACPI_POWER_COMPONENT 0x00800000 |
50 | #define ACPI_POWER_CLASS "power_resource" | 50 | #define ACPI_POWER_CLASS "power_resource" |
51 | #define ACPI_POWER_DRIVER_NAME "ACPI Power Resource Driver" | ||
52 | #define ACPI_POWER_DEVICE_NAME "Power Resource" | 51 | #define ACPI_POWER_DEVICE_NAME "Power Resource" |
53 | #define ACPI_POWER_FILE_INFO "info" | 52 | #define ACPI_POWER_FILE_INFO "info" |
54 | #define ACPI_POWER_FILE_STATUS "state" | 53 | #define ACPI_POWER_FILE_STATUS "state" |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 19c44b52b057..911fc8cae0c1 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -60,7 +60,6 @@ | |||
60 | 60 | ||
61 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 | 61 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 |
62 | #define ACPI_PROCESSOR_CLASS "processor" | 62 | #define ACPI_PROCESSOR_CLASS "processor" |
63 | #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" | ||
64 | #define ACPI_PROCESSOR_DEVICE_NAME "Processor" | 63 | #define ACPI_PROCESSOR_DEVICE_NAME "Processor" |
65 | #define ACPI_PROCESSOR_FILE_INFO "info" | 64 | #define ACPI_PROCESSOR_FILE_INFO "info" |
66 | #define ACPI_PROCESSOR_FILE_THROTTLING "throttling" | 65 | #define ACPI_PROCESSOR_FILE_THROTTLING "throttling" |
@@ -77,7 +76,7 @@ | |||
77 | ACPI_MODULE_NAME("processor_core"); | 76 | ACPI_MODULE_NAME("processor_core"); |
78 | 77 | ||
79 | MODULE_AUTHOR("Paul Diefenbaugh"); | 78 | MODULE_AUTHOR("Paul Diefenbaugh"); |
80 | MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME); | 79 | MODULE_DESCRIPTION("ACPI Processor Driver"); |
81 | MODULE_LICENSE("GPL"); | 80 | MODULE_LICENSE("GPL"); |
82 | 81 | ||
83 | static int acpi_processor_add(struct acpi_device *device); | 82 | static int acpi_processor_add(struct acpi_device *device); |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index a26433d1a16e..92f5185464d2 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -48,7 +48,6 @@ | |||
48 | 48 | ||
49 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 | 49 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 |
50 | #define ACPI_PROCESSOR_CLASS "processor" | 50 | #define ACPI_PROCESSOR_CLASS "processor" |
51 | #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" | ||
52 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 51 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
53 | ACPI_MODULE_NAME("processor_idle"); | 52 | ACPI_MODULE_NAME("processor_idle"); |
54 | #define ACPI_PROCESSOR_FILE_POWER "power" | 53 | #define ACPI_PROCESSOR_FILE_POWER "power" |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index c2add4ea01f9..2f2e7964226d 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
@@ -44,7 +44,6 @@ | |||
44 | 44 | ||
45 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 | 45 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 |
46 | #define ACPI_PROCESSOR_CLASS "processor" | 46 | #define ACPI_PROCESSOR_CLASS "processor" |
47 | #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" | ||
48 | #define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" | 47 | #define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" |
49 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 48 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
50 | ACPI_MODULE_NAME("processor_perflib"); | 49 | ACPI_MODULE_NAME("processor_perflib"); |
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 9357d636a8de..06e6f3fb8825 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 | 42 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 |
43 | #define ACPI_PROCESSOR_CLASS "processor" | 43 | #define ACPI_PROCESSOR_CLASS "processor" |
44 | #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" | ||
45 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 44 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
46 | ACPI_MODULE_NAME("processor_thermal"); | 45 | ACPI_MODULE_NAME("processor_thermal"); |
47 | 46 | ||
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 8194eb03229b..b33486009f41 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 | 42 | #define ACPI_PROCESSOR_COMPONENT 0x01000000 |
43 | #define ACPI_PROCESSOR_CLASS "processor" | 43 | #define ACPI_PROCESSOR_CLASS "processor" |
44 | #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" | ||
45 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 44 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
46 | ACPI_MODULE_NAME("processor_throttling"); | 45 | ACPI_MODULE_NAME("processor_throttling"); |
47 | 46 | ||
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 1c2d8fb07758..1eab2034c9a5 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -59,7 +59,6 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); | |||
59 | #define ACPI_AC_CLASS "ac_adapter" | 59 | #define ACPI_AC_CLASS "ac_adapter" |
60 | #define ACPI_BATTERY_CLASS "battery" | 60 | #define ACPI_BATTERY_CLASS "battery" |
61 | #define ACPI_SBS_HID "ACPI0002" | 61 | #define ACPI_SBS_HID "ACPI0002" |
62 | #define ACPI_SBS_DRIVER_NAME "ACPI Smart Battery System Driver" | ||
63 | #define ACPI_SBS_DEVICE_NAME "Smart Battery System" | 62 | #define ACPI_SBS_DEVICE_NAME "Smart Battery System" |
64 | #define ACPI_SBS_FILE_INFO "info" | 63 | #define ACPI_SBS_FILE_INFO "info" |
65 | #define ACPI_SBS_FILE_STATE "state" | 64 | #define ACPI_SBS_FILE_STATE "state" |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index cff1b590d94d..bb0e0da39fb1 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -17,7 +17,6 @@ extern struct acpi_device *acpi_root; | |||
17 | 17 | ||
18 | #define ACPI_BUS_CLASS "system_bus" | 18 | #define ACPI_BUS_CLASS "system_bus" |
19 | #define ACPI_BUS_HID "ACPI_BUS" | 19 | #define ACPI_BUS_HID "ACPI_BUS" |
20 | #define ACPI_BUS_DRIVER_NAME "ACPI Bus Driver" | ||
21 | #define ACPI_BUS_DEVICE_NAME "System Bus" | 20 | #define ACPI_BUS_DEVICE_NAME "System Bus" |
22 | 21 | ||
23 | static LIST_HEAD(acpi_device_list); | 22 | static LIST_HEAD(acpi_device_list); |
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index edead9e9faa0..83a8d3097904 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
@@ -38,7 +38,6 @@ ACPI_MODULE_NAME("system"); | |||
38 | #define MODULE_PARAM_PREFIX "acpi." | 38 | #define MODULE_PARAM_PREFIX "acpi." |
39 | 39 | ||
40 | #define ACPI_SYSTEM_CLASS "system" | 40 | #define ACPI_SYSTEM_CLASS "system" |
41 | #define ACPI_SYSTEM_DRIVER_NAME "ACPI System Driver" | ||
42 | #define ACPI_SYSTEM_DEVICE_NAME "System" | 41 | #define ACPI_SYSTEM_DEVICE_NAME "System" |
43 | #define ACPI_SYSTEM_FILE_INFO "info" | 42 | #define ACPI_SYSTEM_FILE_INFO "info" |
44 | #define ACPI_SYSTEM_FILE_EVENT "event" | 43 | #define ACPI_SYSTEM_FILE_EVENT "event" |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index c34a89d34560..f50a405d0134 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -46,7 +46,6 @@ | |||
46 | 46 | ||
47 | #define ACPI_THERMAL_COMPONENT 0x04000000 | 47 | #define ACPI_THERMAL_COMPONENT 0x04000000 |
48 | #define ACPI_THERMAL_CLASS "thermal_zone" | 48 | #define ACPI_THERMAL_CLASS "thermal_zone" |
49 | #define ACPI_THERMAL_DRIVER_NAME "ACPI Thermal Zone Driver" | ||
50 | #define ACPI_THERMAL_DEVICE_NAME "Thermal Zone" | 49 | #define ACPI_THERMAL_DEVICE_NAME "Thermal Zone" |
51 | #define ACPI_THERMAL_FILE_STATE "state" | 50 | #define ACPI_THERMAL_FILE_STATE "state" |
52 | #define ACPI_THERMAL_FILE_TEMPERATURE "temperature" | 51 | #define ACPI_THERMAL_FILE_TEMPERATURE "temperature" |
@@ -73,7 +72,7 @@ | |||
73 | ACPI_MODULE_NAME("thermal"); | 72 | ACPI_MODULE_NAME("thermal"); |
74 | 73 | ||
75 | MODULE_AUTHOR("Paul Diefenbaugh"); | 74 | MODULE_AUTHOR("Paul Diefenbaugh"); |
76 | MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME); | 75 | MODULE_DESCRIPTION("ACPI Thermal Zone Driver"); |
77 | MODULE_LICENSE("GPL"); | 76 | MODULE_LICENSE("GPL"); |
78 | 77 | ||
79 | static int tzp; | 78 | static int tzp; |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 0c44ffd1e512..bf525cca3b63 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | #define ACPI_VIDEO_COMPONENT 0x08000000 | 41 | #define ACPI_VIDEO_COMPONENT 0x08000000 |
42 | #define ACPI_VIDEO_CLASS "video" | 42 | #define ACPI_VIDEO_CLASS "video" |
43 | #define ACPI_VIDEO_DRIVER_NAME "ACPI Video Driver" | ||
44 | #define ACPI_VIDEO_BUS_NAME "Video Bus" | 43 | #define ACPI_VIDEO_BUS_NAME "Video Bus" |
45 | #define ACPI_VIDEO_DEVICE_NAME "Video Device" | 44 | #define ACPI_VIDEO_DEVICE_NAME "Video Device" |
46 | #define ACPI_VIDEO_NOTIFY_SWITCH 0x80 | 45 | #define ACPI_VIDEO_NOTIFY_SWITCH 0x80 |
@@ -68,7 +67,7 @@ | |||
68 | ACPI_MODULE_NAME("video"); | 67 | ACPI_MODULE_NAME("video"); |
69 | 68 | ||
70 | MODULE_AUTHOR("Bruno Ducrot"); | 69 | MODULE_AUTHOR("Bruno Ducrot"); |
71 | MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME); | 70 | MODULE_DESCRIPTION("ACPI Video Driver"); |
72 | MODULE_LICENSE("GPL"); | 71 | MODULE_LICENSE("GPL"); |
73 | 72 | ||
74 | static int acpi_video_bus_add(struct acpi_device *device); | 73 | static int acpi_video_bus_add(struct acpi_device *device); |