tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Len Brown <len.brown@intel.com>

Len Brown f52fd66d ec2f9d13

+39 -39
+2 -2
drivers/acpi/ac.c
··· 44 44 #define ACPI_AC_STATUS_UNKNOWN 0xFF 45 45 46 46 #define _COMPONENT ACPI_AC_COMPONENT 47 - ACPI_MODULE_NAME("acpi_ac") 47 + ACPI_MODULE_NAME("ac"); 48 48 49 - MODULE_AUTHOR("Paul Diefenbaugh"); 49 + MODULE_AUTHOR("Paul Diefenbaugh"); 50 50 MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME); 51 51 MODULE_LICENSE("GPL"); 52 52
+2 -2
drivers/acpi/acpi_memhotplug.c
··· 40 40 41 41 #define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT 42 42 43 - ACPI_MODULE_NAME("acpi_memory") 44 - MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); 43 + ACPI_MODULE_NAME("acpi_memhotplug"); 44 + MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); 45 45 MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME); 46 46 MODULE_LICENSE("GPL"); 47 47
+2 -2
drivers/acpi/battery.c
··· 53 53 #define ACPI_BATTERY_UNITS_AMPS "mA" 54 54 55 55 #define _COMPONENT ACPI_BATTERY_COMPONENT 56 - ACPI_MODULE_NAME("acpi_battery") 56 + ACPI_MODULE_NAME("battery"); 57 57 58 - MODULE_AUTHOR("Paul Diefenbaugh"); 58 + MODULE_AUTHOR("Paul Diefenbaugh"); 59 59 MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME); 60 60 MODULE_LICENSE("GPL"); 61 61
+1 -1
drivers/acpi/bay.c
··· 34 34 35 35 #define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver" 36 36 37 - ACPI_MODULE_NAME("bay") 37 + ACPI_MODULE_NAME("bay"); 38 38 MODULE_AUTHOR("Kristen Carlson Accardi"); 39 39 MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME); 40 40 MODULE_LICENSE("GPL");
+1 -1
drivers/acpi/bus.c
··· 39 39 #include <acpi/acpi_drivers.h> 40 40 41 41 #define _COMPONENT ACPI_BUS_COMPONENT 42 - ACPI_MODULE_NAME("acpi_bus") 42 + ACPI_MODULE_NAME("bus"); 43 43 #ifdef CONFIG_X86 44 44 extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger); 45 45 #endif
+1 -1
drivers/acpi/button.c
··· 61 61 #define ACPI_BUTTON_TYPE_LID 0x05 62 62 63 63 #define _COMPONENT ACPI_BUTTON_COMPONENT 64 - ACPI_MODULE_NAME("acpi_button") 64 + ACPI_MODULE_NAME("button"); 65 65 66 66 MODULE_AUTHOR("Paul Diefenbaugh"); 67 67 MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);
+1 -1
drivers/acpi/cm_sbs.c
··· 31 31 #include <acpi/actypes.h> 32 32 #include <acpi/acutils.h> 33 33 34 - ACPI_MODULE_NAME("cm_sbs") 34 + ACPI_MODULE_NAME("cm_sbs"); 35 35 #define ACPI_AC_CLASS "ac_adapter" 36 36 #define ACPI_BATTERY_CLASS "battery" 37 37 #define ACPI_SBS_COMPONENT 0x00080000
+2 -2
drivers/acpi/container.c
··· 44 44 45 45 #define ACPI_CONTAINER_COMPONENT 0x01000000 46 46 #define _COMPONENT ACPI_CONTAINER_COMPONENT 47 - ACPI_MODULE_NAME("acpi_container") 47 + ACPI_MODULE_NAME("container"); 48 48 49 - MODULE_AUTHOR("Anil S Keshavamurthy"); 49 + MODULE_AUTHOR("Anil S Keshavamurthy"); 50 50 MODULE_DESCRIPTION(ACPI_CONTAINER_DRIVER_NAME); 51 51 MODULE_LICENSE("GPL"); 52 52
+1 -1
drivers/acpi/debug.c
··· 12 12 #include <acpi/acglobal.h> 13 13 14 14 #define _COMPONENT ACPI_SYSTEM_COMPONENT 15 - ACPI_MODULE_NAME("debug") 15 + ACPI_MODULE_NAME("debug"); 16 16 17 17 #ifdef MODULE_PARAM_PREFIX 18 18 #undef MODULE_PARAM_PREFIX
+1 -1
drivers/acpi/dock.c
··· 34 34 35 35 #define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver" 36 36 37 - ACPI_MODULE_NAME("dock") 37 + ACPI_MODULE_NAME("dock"); 38 38 MODULE_AUTHOR("Kristen Carlson Accardi"); 39 39 MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME); 40 40 MODULE_LICENSE("GPL");
+1 -1
drivers/acpi/ec.c
··· 38 38 #include <acpi/actypes.h> 39 39 40 40 #define _COMPONENT ACPI_EC_COMPONENT 41 - ACPI_MODULE_NAME("acpi_ec") 41 + ACPI_MODULE_NAME("ec"); 42 42 #define ACPI_EC_COMPONENT 0x00100000 43 43 #define ACPI_EC_CLASS "embedded_controller" 44 44 #define ACPI_EC_HID "PNP0C09"
+1 -1
drivers/acpi/event.c
··· 13 13 #include <acpi/acpi_drivers.h> 14 14 15 15 #define _COMPONENT ACPI_SYSTEM_COMPONENT 16 - ACPI_MODULE_NAME("event") 16 + ACPI_MODULE_NAME("event"); 17 17 18 18 /* Global vars for handling event proc entry */ 19 19 static DEFINE_SPINLOCK(acpi_system_event_lock);
+2 -2
drivers/acpi/fan.c
··· 40 40 #define ACPI_FAN_FILE_STATE "state" 41 41 42 42 #define _COMPONENT ACPI_FAN_COMPONENT 43 - ACPI_MODULE_NAME("acpi_fan") 43 + ACPI_MODULE_NAME("fan"); 44 44 45 - MODULE_AUTHOR("Paul Diefenbaugh"); 45 + MODULE_AUTHOR("Paul Diefenbaugh"); 46 46 MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME); 47 47 MODULE_LICENSE("GPL"); 48 48
+1 -1
drivers/acpi/i2c_ec.c
··· 33 33 34 34 #define _COMPONENT ACPI_EC_HC_COMPONENT 35 35 36 - ACPI_MODULE_NAME("acpi_smbus") 36 + ACPI_MODULE_NAME("i2c_ec"); 37 37 38 38 static int acpi_ec_hc_add(struct acpi_device *device); 39 39 static int acpi_ec_hc_remove(struct acpi_device *device, int type);
+1 -1
drivers/acpi/numa.c
··· 33 33 34 34 #define ACPI_NUMA 0x80000000 35 35 #define _COMPONENT ACPI_NUMA 36 - ACPI_MODULE_NAME("numa") 36 + ACPI_MODULE_NAME("numa"); 37 37 38 38 static nodemask_t nodes_found_map = NODE_MASK_NONE; 39 39 #define PXM_INVAL -1
+1 -1
drivers/acpi/osl.c
··· 46 46 #include <linux/efi.h> 47 47 48 48 #define _COMPONENT ACPI_OS_SERVICES 49 - ACPI_MODULE_NAME("osl") 49 + ACPI_MODULE_NAME("osl"); 50 50 #define PREFIX "ACPI: " 51 51 struct acpi_os_dpc { 52 52 acpi_osd_exec_callback function;
+1 -1
drivers/acpi/pci_bind.c
··· 36 36 #include <acpi/acpi_drivers.h> 37 37 38 38 #define _COMPONENT ACPI_PCI_COMPONENT 39 - ACPI_MODULE_NAME("pci_bind") 39 + ACPI_MODULE_NAME("pci_bind"); 40 40 41 41 struct acpi_pci_data { 42 42 struct acpi_pci_id id;
+1 -1
drivers/acpi/pci_irq.c
··· 38 38 #include <acpi/acpi_drivers.h> 39 39 40 40 #define _COMPONENT ACPI_PCI_COMPONENT 41 - ACPI_MODULE_NAME("pci_irq") 41 + ACPI_MODULE_NAME("pci_irq"); 42 42 43 43 static struct acpi_prt_list acpi_prt; 44 44 static DEFINE_SPINLOCK(acpi_prt_lock);
+1 -1
drivers/acpi/pci_link.c
··· 44 44 #include <acpi/acpi_drivers.h> 45 45 46 46 #define _COMPONENT ACPI_PCI_COMPONENT 47 - ACPI_MODULE_NAME("pci_link") 47 + ACPI_MODULE_NAME("pci_link"); 48 48 #define ACPI_PCI_LINK_CLASS "pci_irq_routing" 49 49 #define ACPI_PCI_LINK_HID "PNP0C0F" 50 50 #define ACPI_PCI_LINK_DRIVER_NAME "ACPI PCI Interrupt Link Driver"
+1 -1
drivers/acpi/pci_root.c
··· 36 36 #include <acpi/acpi_drivers.h> 37 37 38 38 #define _COMPONENT ACPI_PCI_COMPONENT 39 - ACPI_MODULE_NAME("pci_root") 39 + ACPI_MODULE_NAME("pci_root"); 40 40 #define ACPI_PCI_ROOT_CLASS "pci_bridge" 41 41 #define ACPI_PCI_ROOT_HID "PNP0A03" 42 42 #define ACPI_PCI_ROOT_DRIVER_NAME "ACPI PCI Root Bridge Driver"
+1 -1
drivers/acpi/power.c
··· 45 45 #include <acpi/acpi_drivers.h> 46 46 47 47 #define _COMPONENT ACPI_POWER_COMPONENT 48 - ACPI_MODULE_NAME("acpi_power") 48 + ACPI_MODULE_NAME("power"); 49 49 #define ACPI_POWER_COMPONENT 0x00800000 50 50 #define ACPI_POWER_CLASS "power_resource" 51 51 #define ACPI_POWER_DRIVER_NAME "ACPI Power Resource Driver"
+2 -2
drivers/acpi/processor_core.c
··· 74 74 #define ACPI_STA_PRESENT 0x00000001 75 75 76 76 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 77 - ACPI_MODULE_NAME("acpi_processor") 77 + ACPI_MODULE_NAME("processor_core"); 78 78 79 - MODULE_AUTHOR("Paul Diefenbaugh"); 79 + MODULE_AUTHOR("Paul Diefenbaugh"); 80 80 MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME); 81 81 MODULE_LICENSE("GPL"); 82 82
+1 -1
drivers/acpi/processor_idle.c
··· 50 50 #define ACPI_PROCESSOR_CLASS "processor" 51 51 #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" 52 52 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 53 - ACPI_MODULE_NAME("acpi_processor") 53 + ACPI_MODULE_NAME("processor_idle"); 54 54 #define ACPI_PROCESSOR_FILE_POWER "power" 55 55 #define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000) 56 56 #define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */
+1 -1
drivers/acpi/processor_perflib.c
··· 47 47 #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" 48 48 #define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" 49 49 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 50 - ACPI_MODULE_NAME("acpi_processor") 50 + ACPI_MODULE_NAME("processor_perflib"); 51 51 52 52 static DEFINE_MUTEX(performance_mutex); 53 53
+1 -1
drivers/acpi/processor_thermal.c
··· 43 43 #define ACPI_PROCESSOR_CLASS "processor" 44 44 #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" 45 45 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 46 - ACPI_MODULE_NAME("acpi_processor") 46 + ACPI_MODULE_NAME("processor_thermal"); 47 47 48 48 /* -------------------------------------------------------------------------- 49 49 Limit Interface
+1 -1
drivers/acpi/processor_throttling.c
··· 43 43 #define ACPI_PROCESSOR_CLASS "processor" 44 44 #define ACPI_PROCESSOR_DRIVER_NAME "ACPI Processor Driver" 45 45 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 46 - ACPI_MODULE_NAME("acpi_processor") 46 + ACPI_MODULE_NAME("processor_throttling"); 47 47 48 48 /* -------------------------------------------------------------------------- 49 49 Throttling Control
+1 -1
drivers/acpi/sbs.c
··· 78 78 #define MAX_SBS_BAT 4 79 79 #define MAX_SMBUS_ERR 1 80 80 81 - ACPI_MODULE_NAME("acpi_sbs"); 81 + ACPI_MODULE_NAME("sbs"); 82 82 83 83 MODULE_AUTHOR("Rich Townsend"); 84 84 MODULE_DESCRIPTION("Smart Battery System ACPI interface driver");
+1 -1
drivers/acpi/scan.c
··· 11 11 #include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */ 12 12 13 13 #define _COMPONENT ACPI_BUS_COMPONENT 14 - ACPI_MODULE_NAME("scan") 14 + ACPI_MODULE_NAME("scan"); 15 15 #define STRUCT_TO_INT(s) (*((int*)&s)) 16 16 extern struct acpi_device *acpi_root; 17 17
+1 -1
drivers/acpi/system.c
··· 31 31 #include <acpi/acpi_drivers.h> 32 32 33 33 #define _COMPONENT ACPI_SYSTEM_COMPONENT 34 - ACPI_MODULE_NAME("acpi_system") 34 + ACPI_MODULE_NAME("system"); 35 35 #ifdef MODULE_PARAM_PREFIX 36 36 #undef MODULE_PARAM_PREFIX 37 37 #endif
+1 -1
drivers/acpi/thermal.c
··· 70 70 #define CELSIUS_TO_KELVIN(t) ((t+273)*10) 71 71 72 72 #define _COMPONENT ACPI_THERMAL_COMPONENT 73 - ACPI_MODULE_NAME("acpi_thermal") 73 + ACPI_MODULE_NAME("thermal"); 74 74 75 75 MODULE_AUTHOR("Paul Diefenbaugh"); 76 76 MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME);
+1 -1
drivers/acpi/utils.c
··· 31 31 #include <acpi/acpi_drivers.h> 32 32 33 33 #define _COMPONENT ACPI_BUS_COMPONENT 34 - ACPI_MODULE_NAME("acpi_utils") 34 + ACPI_MODULE_NAME("utils"); 35 35 36 36 /* -------------------------------------------------------------------------- 37 37 Object Evaluation Helpers
+2 -2
drivers/acpi/video.c
··· 65 65 #define ACPI_VIDEO_DISPLAY_LCD 4 66 66 67 67 #define _COMPONENT ACPI_VIDEO_COMPONENT 68 - ACPI_MODULE_NAME("acpi_video") 68 + ACPI_MODULE_NAME("video"); 69 69 70 - MODULE_AUTHOR("Bruno Ducrot"); 70 + MODULE_AUTHOR("Bruno Ducrot"); 71 71 MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME); 72 72 MODULE_LICENSE("GPL"); 73 73