acpi: simplify module_param namespace

Commit Message

Rusty Russell March 10, 2009, 10:57 p.m. UTC

On Monday 09 March 2009 12:50:44 yakui_zhao wrote:
> On Sat, 2009-03-07 at 10:58 +0800, Rusty Russell wrote:
> > -obj-y				+= osl.o utils.o reboot.o\
> > +obj-y				+= acpi.o \
> >  					acpica/
> 
> If so, it can't be guaranteed that the EC driver is initialized before
> the power resource driver.

Ah, thankyou, I had not read that comment.

This version is bigger, but simpler, and doesn't change link order.  It just
moves everything into the acpi module.

Subject: 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.

Signed-off-by: Rusty Russell <[e-mail]>
---
 drivers/acpi/Makefile |   57 ++++++++++++++++++++++++++------------------------
 drivers/acpi/debug.c  |    5 ----
 drivers/acpi/power.c  |    4 ---
 drivers/acpi/system.c |    4 ---
 4 files changed, 30 insertions(+), 40 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Rothwell March 11, 2009, 3:51 a.m. UTC | #1

Hi Rusty,

On Wed, 11 Mar 2009 09:27:12 +1030 Rusty Russell <[e-mail]> wrote:
>
> This version is bigger, but simpler, and doesn't change link order.  It just
> moves everything into the acpi module.

So we end up with one big acpi.ko module instead of separate modules
(like battery.ko, dock.ko) some of which we may not have needed to
load?  Just clarifying.

Patch

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -14,13 +14,16 @@  obj-$(CONFIG_X86)		+= blacklist.o
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-y				+= osl.o utils.o reboot.o\
+obj-y				+= acpi.o \
 					acpica/
 
+# Everything below is in the "acpi." module_param namespace.
+acpi-y				+= osl.o utils.o reboot.o
+
 # sleep related files
-obj-y				+= wakeup.o
-obj-y				+= sleep.o
-obj-$(CONFIG_ACPI_SLEEP)	+= proc.o
+acpi-y				+= wakeup.o
+acpi-y				+= sleep.o
+acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
 
 
 #
@@ -32,30 +35,30 @@  processor-objs	+= processor_perflib.o
 processor-objs	+= processor_perflib.o
 endif
 
-obj-y				+= bus.o glue.o
-obj-y				+= scan.o
+acpi-y				+= bus.o glue.o
+acpi-y				+= scan.o
 # Keep EC driver first. Initialization of others depend on it.
-obj-y				+= ec.o
-obj-$(CONFIG_ACPI_AC) 		+= ac.o
-obj-$(CONFIG_ACPI_BATTERY)	+= battery.o
-obj-$(CONFIG_ACPI_BUTTON)	+= button.o
-obj-$(CONFIG_ACPI_FAN)		+= fan.o
-obj-$(CONFIG_ACPI_DOCK)		+= dock.o
-obj-$(CONFIG_ACPI_VIDEO)	+= video.o
+acpi-y				+= ec.o
+acpi-$(CONFIG_ACPI_AC) 		+= ac.o
+acpi-$(CONFIG_ACPI_BATTERY)	+= battery.o
+acpi-$(CONFIG_ACPI_BUTTON)	+= button.o
+acpi-$(CONFIG_ACPI_FAN)		+= fan.o
+acpi-$(CONFIG_ACPI_DOCK)	+= dock.o
+acpi-$(CONFIG_ACPI_VIDEO)	+= video.o
 ifdef CONFIG_ACPI_VIDEO
-obj-y				+= video_detect.o
+acpi-y				+= video_detect.o
 endif
 
-obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
-obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
-obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
-obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
-obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
-obj-y				+= power.o
-obj-y				+= system.o event.o
-obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
-obj-$(CONFIG_ACPI_NUMA)		+= numa.o
-obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o
-obj-$(CONFIG_ACPI_PROCFS_POWER)	+= cm_sbs.o
-obj-$(CONFIG_ACPI_SBS)		+= sbshc.o
-obj-$(CONFIG_ACPI_SBS)		+= sbs.o
+acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
+acpi-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
+acpi-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
+acpi-$(CONFIG_ACPI_CONTAINER)	+= container.o
+acpi-$(CONFIG_ACPI_THERMAL)	+= thermal.o
+acpi-y				+= power.o
+acpi-y				+= system.o event.o
+acpi-$(CONFIG_ACPI_DEBUG)	+= debug.o
+acpi-$(CONFIG_ACPI_NUMA)	+= numa.o
+acpi-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
+acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
+acpi-$(CONFIG_ACPI_SBS)		+= sbshc.o
+acpi-$(CONFIG_ACPI_SBS)		+= sbs.o
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -12,11 +12,6 @@ 
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debug");
-
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 
 struct acpi_dlayer {
 	const char *name;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -54,10 +54,6 @@  ACPI_MODULE_NAME("power");
 #define ACPI_POWER_RESOURCE_STATE_ON	0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
 
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 int acpi_power_nocheck;
 module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
 
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -33,10 +33,6 @@ 
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("system");
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 
 #define ACPI_SYSTEM_CLASS		"system"
 #define ACPI_SYSTEM_DEVICE_NAME		"System"