From patchwork Sat Mar 7 02:58:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rusty Russell X-Patchwork-Id: 10441 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n272xRWc003626 for ; Sat, 7 Mar 2009 02:59:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756122AbZCGC6f (ORCPT ); Fri, 6 Mar 2009 21:58:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756143AbZCGC6f (ORCPT ); Fri, 6 Mar 2009 21:58:35 -0500 Received: from ozlabs.org ([203.10.76.45]:43519 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756122AbZCGC6d (ORCPT ); Fri, 6 Mar 2009 21:58:33 -0500 Received: from vivaldi.localnet (unknown [150.101.102.135]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 58138DDF7A; Sat, 7 Mar 2009 13:58:30 +1100 (EST) From: Rusty Russell To: lenb@kernel.org Subject: [PATCH] acpi: simplify module_param namespace Date: Sat, 7 Mar 2009 13:28:27 +1030 User-Agent: KMail/1.11.1 (Linux/2.6.27-11-generic; KDE/4.2.1; i686; ; ) Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903071328.28113.rusty@rustcorp.com.au> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org (I've been holding this for a while: if you really hate it I'll delete it) 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 --- drivers/acpi/Makefile | 10 ++++++---- drivers/acpi/debug.c | 5 ----- drivers/acpi/power.c | 4 ---- drivers/acpi/system.c | 4 ---- 4 files changed, 6 insertions(+), 17 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -14,8 +14,13 @@ obj-$(CONFIG_X86) += blacklist.o # # ACPI Core Subsystem (Interpreter) # -obj-y += osl.o utils.o reboot.o\ +obj-y += acpi.o \ acpica/ + +# "acpi." module_param namespace. +acpi-y += osl.o utils.o reboot.o power.o \ + system.o event.o +acpi-$(CONFIG_ACPI_DEBUG) += debug.o # sleep related files obj-y += wakeup.o @@ -51,9 +56,6 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processo 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 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"