diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-11 18:37:19 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-02 16:38:11 -0400 |
commit | 5b5d9117407e790ade594687010343c5d559a1f4 (patch) | |
tree | bef1cedd053ae0eec09fa5af3cf3012141b2ede9 /drivers | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
ACPI: simplify module_param namespace
Impact: cleanup
Rather than overriding MODULE_PARAM_PREFIX, build via acpi.o so
KBUILD_MODNAME is set to "acpi".
This is the logical way to do it, even though acpi cannot be a module
due to these config options being bool. Those parts of ACPI which can
be modular are not built into the acpi "module".
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/Makefile | 52 | ||||
-rw-r--r-- | drivers/acpi/debug.c | 5 | ||||
-rw-r--r-- | drivers/acpi/power.c | 4 | ||||
-rw-r--r-- | drivers/acpi/system.c | 4 |
4 files changed, 28 insertions, 37 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index b130ea0d0759..13b611e7eade 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
@@ -14,48 +14,52 @@ obj-$(CONFIG_X86) += blacklist.o | |||
14 | # | 14 | # |
15 | # ACPI Core Subsystem (Interpreter) | 15 | # ACPI Core Subsystem (Interpreter) |
16 | # | 16 | # |
17 | obj-y += osl.o utils.o reboot.o\ | 17 | obj-y += acpi.o \ |
18 | acpica/ | 18 | acpica/ |
19 | 19 | ||
20 | # All the builtin files are in the "acpi." module_param namespace. | ||
21 | acpi-y += osl.o utils.o reboot.o | ||
22 | |||
20 | # sleep related files | 23 | # sleep related files |
21 | obj-y += wakeup.o | 24 | acpi-y += wakeup.o |
22 | obj-y += sleep.o | 25 | acpi-y += sleep.o |
23 | obj-$(CONFIG_ACPI_SLEEP) += proc.o | 26 | acpi-$(CONFIG_ACPI_SLEEP) += proc.o |
24 | 27 | ||
25 | 28 | ||
26 | # | 29 | # |
27 | # ACPI Bus and Device Drivers | 30 | # ACPI Bus and Device Drivers |
28 | # | 31 | # |
29 | processor-objs += processor_core.o processor_throttling.o \ | 32 | acpi-y += bus.o glue.o |
30 | processor_idle.o processor_thermal.o | 33 | acpi-y += scan.o |
31 | ifdef CONFIG_CPU_FREQ | 34 | # Keep EC driver first. Initialization of others depend on it. |
32 | processor-objs += processor_perflib.o | 35 | acpi-y += ec.o |
36 | acpi-$(CONFIG_ACPI_DOCK) += dock.o | ||
37 | acpi-y += pci_root.o pci_link.o pci_irq.o pci_bind.o | ||
38 | acpi-y += power.o | ||
39 | acpi-y += system.o event.o | ||
40 | acpi-$(CONFIG_ACPI_DEBUG) += debug.o | ||
41 | acpi-$(CONFIG_ACPI_NUMA) += numa.o | ||
42 | acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | ||
43 | ifdef CONFIG_ACPI_VIDEO | ||
44 | acpi-y += video_detect.o | ||
33 | endif | 45 | endif |
34 | 46 | ||
35 | obj-y += bus.o glue.o | 47 | # These are (potentially) separate modules |
36 | obj-y += scan.o | ||
37 | # Keep EC driver first. Initialization of others depend on it. | ||
38 | obj-y += ec.o | ||
39 | obj-$(CONFIG_ACPI_AC) += ac.o | 48 | obj-$(CONFIG_ACPI_AC) += ac.o |
40 | obj-$(CONFIG_ACPI_BATTERY) += battery.o | 49 | obj-$(CONFIG_ACPI_BATTERY) += battery.o |
41 | obj-$(CONFIG_ACPI_BUTTON) += button.o | 50 | obj-$(CONFIG_ACPI_BUTTON) += button.o |
42 | obj-$(CONFIG_ACPI_FAN) += fan.o | 51 | obj-$(CONFIG_ACPI_FAN) += fan.o |
43 | obj-$(CONFIG_ACPI_DOCK) += dock.o | ||
44 | obj-$(CONFIG_ACPI_VIDEO) += video.o | 52 | obj-$(CONFIG_ACPI_VIDEO) += video.o |
45 | ifdef CONFIG_ACPI_VIDEO | ||
46 | obj-y += video_detect.o | ||
47 | endif | ||
48 | |||
49 | obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o | ||
50 | obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o | 53 | obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o |
51 | obj-$(CONFIG_ACPI_PROCESSOR) += processor.o | 54 | obj-$(CONFIG_ACPI_PROCESSOR) += processor.o |
52 | obj-$(CONFIG_ACPI_CONTAINER) += container.o | 55 | obj-$(CONFIG_ACPI_CONTAINER) += container.o |
53 | obj-$(CONFIG_ACPI_THERMAL) += thermal.o | 56 | obj-$(CONFIG_ACPI_THERMAL) += thermal.o |
54 | obj-y += power.o | 57 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |
55 | obj-y += system.o event.o | ||
56 | obj-$(CONFIG_ACPI_DEBUG) += debug.o | ||
57 | obj-$(CONFIG_ACPI_NUMA) += numa.o | ||
58 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o | ||
59 | obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | ||
60 | obj-$(CONFIG_ACPI_SBS) += sbshc.o | 58 | obj-$(CONFIG_ACPI_SBS) += sbshc.o |
61 | obj-$(CONFIG_ACPI_SBS) += sbs.o | 59 | obj-$(CONFIG_ACPI_SBS) += sbs.o |
60 | |||
61 | processor-objs += processor_core.o processor_throttling.o \ | ||
62 | processor_idle.o processor_thermal.o | ||
63 | ifdef CONFIG_CPU_FREQ | ||
64 | processor-objs += processor_perflib.o | ||
65 | endif | ||
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index 20223cbd0d1c..25f9c38531bd 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c | |||
@@ -13,11 +13,6 @@ | |||
13 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 13 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
14 | ACPI_MODULE_NAME("debug"); | 14 | ACPI_MODULE_NAME("debug"); |
15 | 15 | ||
16 | #ifdef MODULE_PARAM_PREFIX | ||
17 | #undef MODULE_PARAM_PREFIX | ||
18 | #endif | ||
19 | #define MODULE_PARAM_PREFIX "acpi." | ||
20 | |||
21 | struct acpi_dlayer { | 16 | struct acpi_dlayer { |
22 | const char *name; | 17 | const char *name; |
23 | unsigned long value; | 18 | unsigned long value; |
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index c926e7d4a0d6..87361c1592d3 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
@@ -54,10 +54,6 @@ ACPI_MODULE_NAME("power"); | |||
54 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 | 54 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 |
55 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF | 55 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF |
56 | 56 | ||
57 | #ifdef MODULE_PARAM_PREFIX | ||
58 | #undef MODULE_PARAM_PREFIX | ||
59 | #endif | ||
60 | #define MODULE_PARAM_PREFIX "acpi." | ||
61 | int acpi_power_nocheck; | 57 | int acpi_power_nocheck; |
62 | module_param_named(power_nocheck, acpi_power_nocheck, bool, 000); | 58 | module_param_named(power_nocheck, acpi_power_nocheck, bool, 000); |
63 | 59 | ||
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 391d0358a592..a0499d00020c 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
@@ -33,10 +33,6 @@ | |||
33 | 33 | ||
34 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 34 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
35 | ACPI_MODULE_NAME("system"); | 35 | ACPI_MODULE_NAME("system"); |
36 | #ifdef MODULE_PARAM_PREFIX | ||
37 | #undef MODULE_PARAM_PREFIX | ||
38 | #endif | ||
39 | #define MODULE_PARAM_PREFIX "acpi." | ||
40 | 36 | ||
41 | #define ACPI_SYSTEM_CLASS "system" | 37 | #define ACPI_SYSTEM_CLASS "system" |
42 | #define ACPI_SYSTEM_DEVICE_NAME "System" | 38 | #define ACPI_SYSTEM_DEVICE_NAME "System" |