Commit f52fd66d authored by Len Brown's avatar Len Brown

ACPI: clean up ACPI_MODULE_NAME() use

cosmetic only

Make "module name" actually match the file name.
Invoke with ';' as leaving it off confuses Lindent and gcc doesn't care.
Fix indentation where Lindent did get confused.
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ec2f9d13
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
#define ACPI_AC_STATUS_UNKNOWN 0xFF #define ACPI_AC_STATUS_UNKNOWN 0xFF
#define _COMPONENT ACPI_AC_COMPONENT #define _COMPONENT ACPI_AC_COMPONENT
ACPI_MODULE_NAME("acpi_ac") ACPI_MODULE_NAME("ac");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT #define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT
ACPI_MODULE_NAME("acpi_memory") ACPI_MODULE_NAME("acpi_memhotplug");
MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
#define ACPI_BATTERY_UNITS_AMPS "mA" #define ACPI_BATTERY_UNITS_AMPS "mA"
#define _COMPONENT ACPI_BATTERY_COMPONENT #define _COMPONENT ACPI_BATTERY_COMPONENT
ACPI_MODULE_NAME("acpi_battery") ACPI_MODULE_NAME("battery");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver" #define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver"
ACPI_MODULE_NAME("bay") ACPI_MODULE_NAME("bay");
MODULE_AUTHOR("Kristen Carlson Accardi"); MODULE_AUTHOR("Kristen Carlson Accardi");
MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_BUS_COMPONENT #define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME("acpi_bus") ACPI_MODULE_NAME("bus");
#ifdef CONFIG_X86 #ifdef CONFIG_X86
extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger); extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
#endif #endif
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#define ACPI_BUTTON_TYPE_LID 0x05 #define ACPI_BUTTON_TYPE_LID 0x05
#define _COMPONENT ACPI_BUTTON_COMPONENT #define _COMPONENT ACPI_BUTTON_COMPONENT
ACPI_MODULE_NAME("acpi_button") ACPI_MODULE_NAME("button");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <acpi/actypes.h> #include <acpi/actypes.h>
#include <acpi/acutils.h> #include <acpi/acutils.h>
ACPI_MODULE_NAME("cm_sbs") ACPI_MODULE_NAME("cm_sbs");
#define ACPI_AC_CLASS "ac_adapter" #define ACPI_AC_CLASS "ac_adapter"
#define ACPI_BATTERY_CLASS "battery" #define ACPI_BATTERY_CLASS "battery"
#define ACPI_SBS_COMPONENT 0x00080000 #define ACPI_SBS_COMPONENT 0x00080000
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
#define ACPI_CONTAINER_COMPONENT 0x01000000 #define ACPI_CONTAINER_COMPONENT 0x01000000
#define _COMPONENT ACPI_CONTAINER_COMPONENT #define _COMPONENT ACPI_CONTAINER_COMPONENT
ACPI_MODULE_NAME("acpi_container") ACPI_MODULE_NAME("container");
MODULE_AUTHOR("Anil S Keshavamurthy"); MODULE_AUTHOR("Anil S Keshavamurthy");
MODULE_DESCRIPTION(ACPI_CONTAINER_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_CONTAINER_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <acpi/acglobal.h> #include <acpi/acglobal.h>
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("debug") ACPI_MODULE_NAME("debug");
#ifdef MODULE_PARAM_PREFIX #ifdef MODULE_PARAM_PREFIX
#undef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver" #define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver"
ACPI_MODULE_NAME("dock") ACPI_MODULE_NAME("dock");
MODULE_AUTHOR("Kristen Carlson Accardi"); MODULE_AUTHOR("Kristen Carlson Accardi");
MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <acpi/actypes.h> #include <acpi/actypes.h>
#define _COMPONENT ACPI_EC_COMPONENT #define _COMPONENT ACPI_EC_COMPONENT
ACPI_MODULE_NAME("acpi_ec") ACPI_MODULE_NAME("ec");
#define ACPI_EC_COMPONENT 0x00100000 #define ACPI_EC_COMPONENT 0x00100000
#define ACPI_EC_CLASS "embedded_controller" #define ACPI_EC_CLASS "embedded_controller"
#define ACPI_EC_HID "PNP0C09" #define ACPI_EC_HID "PNP0C09"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("event") ACPI_MODULE_NAME("event");
/* Global vars for handling event proc entry */ /* Global vars for handling event proc entry */
static DEFINE_SPINLOCK(acpi_system_event_lock); static DEFINE_SPINLOCK(acpi_system_event_lock);
......
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
#define ACPI_FAN_FILE_STATE "state" #define ACPI_FAN_FILE_STATE "state"
#define _COMPONENT ACPI_FAN_COMPONENT #define _COMPONENT ACPI_FAN_COMPONENT
ACPI_MODULE_NAME("acpi_fan") ACPI_MODULE_NAME("fan");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define _COMPONENT ACPI_EC_HC_COMPONENT #define _COMPONENT ACPI_EC_HC_COMPONENT
ACPI_MODULE_NAME("acpi_smbus") ACPI_MODULE_NAME("i2c_ec");
static int acpi_ec_hc_add(struct acpi_device *device); static int acpi_ec_hc_add(struct acpi_device *device);
static int acpi_ec_hc_remove(struct acpi_device *device, int type); static int acpi_ec_hc_remove(struct acpi_device *device, int type);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define ACPI_NUMA 0x80000000 #define ACPI_NUMA 0x80000000
#define _COMPONENT ACPI_NUMA #define _COMPONENT ACPI_NUMA
ACPI_MODULE_NAME("numa") ACPI_MODULE_NAME("numa");
static nodemask_t nodes_found_map = NODE_MASK_NONE; static nodemask_t nodes_found_map = NODE_MASK_NONE;
#define PXM_INVAL -1 #define PXM_INVAL -1
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <linux/efi.h> #include <linux/efi.h>
#define _COMPONENT ACPI_OS_SERVICES #define _COMPONENT ACPI_OS_SERVICES
ACPI_MODULE_NAME("osl") ACPI_MODULE_NAME("osl");
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
struct acpi_os_dpc { struct acpi_os_dpc {
acpi_osd_exec_callback function; acpi_osd_exec_callback function;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_PCI_COMPONENT #define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_bind") ACPI_MODULE_NAME("pci_bind");
struct acpi_pci_data { struct acpi_pci_data {
struct acpi_pci_id id; struct acpi_pci_id id;
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_PCI_COMPONENT #define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_irq") ACPI_MODULE_NAME("pci_irq");
static struct acpi_prt_list acpi_prt; static struct acpi_prt_list acpi_prt;
static DEFINE_SPINLOCK(acpi_prt_lock); static DEFINE_SPINLOCK(acpi_prt_lock);
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_PCI_COMPONENT #define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_link") ACPI_MODULE_NAME("pci_link");
#define ACPI_PCI_LINK_CLASS "pci_irq_routing" #define ACPI_PCI_LINK_CLASS "pci_irq_routing"
#define ACPI_PCI_LINK_HID "PNP0C0F" #define ACPI_PCI_LINK_HID "PNP0C0F"
#define ACPI_PCI_LINK_DRIVER_NAME "ACPI PCI Interrupt Link Driver" #define ACPI_PCI_LINK_DRIVER_NAME "ACPI PCI Interrupt Link Driver"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_PCI_COMPONENT #define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_root") ACPI_MODULE_NAME("pci_root");
#define ACPI_PCI_ROOT_CLASS "pci_bridge" #define ACPI_PCI_ROOT_CLASS "pci_bridge"
#define ACPI_PCI_ROOT_HID "PNP0A03" #define ACPI_PCI_ROOT_HID "PNP0A03"
#define ACPI_PCI_ROOT_DRIVER_NAME "ACPI PCI Root Bridge Driver" #define ACPI_PCI_ROOT_DRIVER_NAME "ACPI PCI Root Bridge Driver"
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_POWER_COMPONENT #define _COMPONENT ACPI_POWER_COMPONENT
ACPI_MODULE_NAME("acpi_power") ACPI_MODULE_NAME("power");
#define ACPI_POWER_COMPONENT 0x00800000 #define ACPI_POWER_COMPONENT 0x00800000
#define ACPI_POWER_CLASS "power_resource" #define ACPI_POWER_CLASS "power_resource"
#define ACPI_POWER_DRIVER_NAME "ACPI Power Resource Driver" #define ACPI_POWER_DRIVER_NAME "ACPI Power Resource Driver"
......
...@@ -74,9 +74,9 @@ ...@@ -74,9 +74,9 @@
#define ACPI_STA_PRESENT 0x00000001 #define ACPI_STA_PRESENT 0x00000001
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor") ACPI_MODULE_NAME("processor_core");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor") ACPI_MODULE_NAME("processor_idle");
#define ACPI_PROCESSOR_FILE_POWER "power" #define ACPI_PROCESSOR_FILE_POWER "power"
#define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000) #define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
#define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */ #define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
#define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" #define ACPI_PROCESSOR_FILE_PERFORMANCE "performance"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor") ACPI_MODULE_NAME("processor_perflib");
static DEFINE_MUTEX(performance_mutex); static DEFINE_MUTEX(performance_mutex);
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor") ACPI_MODULE_NAME("processor_thermal");
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Limit Interface Limit Interface
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"
#define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor") ACPI_MODULE_NAME("processor_throttling");
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Throttling Control Throttling Control
......
...@@ -78,7 +78,7 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); ...@@ -78,7 +78,7 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
#define MAX_SBS_BAT 4 #define MAX_SBS_BAT 4
#define MAX_SMBUS_ERR 1 #define MAX_SMBUS_ERR 1
ACPI_MODULE_NAME("acpi_sbs"); ACPI_MODULE_NAME("sbs");
MODULE_AUTHOR("Rich Townsend"); MODULE_AUTHOR("Rich Townsend");
MODULE_DESCRIPTION("Smart Battery System ACPI interface driver"); MODULE_DESCRIPTION("Smart Battery System ACPI interface driver");
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */ #include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */
#define _COMPONENT ACPI_BUS_COMPONENT #define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME("scan") ACPI_MODULE_NAME("scan");
#define STRUCT_TO_INT(s) (*((int*)&s)) #define STRUCT_TO_INT(s) (*((int*)&s))
extern struct acpi_device *acpi_root; extern struct acpi_device *acpi_root;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("acpi_system") ACPI_MODULE_NAME("system");
#ifdef MODULE_PARAM_PREFIX #ifdef MODULE_PARAM_PREFIX
#undef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX
#endif #endif
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#define CELSIUS_TO_KELVIN(t) ((t+273)*10) #define CELSIUS_TO_KELVIN(t) ((t+273)*10)
#define _COMPONENT ACPI_THERMAL_COMPONENT #define _COMPONENT ACPI_THERMAL_COMPONENT
ACPI_MODULE_NAME("acpi_thermal") ACPI_MODULE_NAME("thermal");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#define _COMPONENT ACPI_BUS_COMPONENT #define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME("acpi_utils") ACPI_MODULE_NAME("utils");
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Object Evaluation Helpers Object Evaluation Helpers
......
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
#define ACPI_VIDEO_DISPLAY_LCD 4 #define ACPI_VIDEO_DISPLAY_LCD 4
#define _COMPONENT ACPI_VIDEO_COMPONENT #define _COMPONENT ACPI_VIDEO_COMPONENT
ACPI_MODULE_NAME("acpi_video") ACPI_MODULE_NAME("video");
MODULE_AUTHOR("Bruno Ducrot"); MODULE_AUTHOR("Bruno Ducrot");
MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment