* [PATCH] ACPI / PMIC: remove modular references from non-modular code
@ 2016-07-11 22:05 Paul Gortmaker
2016-07-19 20:09 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Paul Gortmaker @ 2016-07-11 22:05 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Rafael J. Wysocki, Len Brown, linux-acpi
The Kconfig currently controlling compilation of these files are:
drivers/acpi/Kconfig:menuconfig PMIC_OPREGION
drivers/acpi/Kconfig: bool "PMIC (Power Management Integrated Circuit) operation region support"
drivers/acpi/Kconfig:config BXT_WC_PMIC_OPREGION
drivers/acpi/Kconfig: bool "ACPI operation region support for BXT WhiskeyCove PMIC"
drivers/acpi/Kconfig:config XPOWER_PMIC_OPREGION
drivers/acpi/Kconfig: bool "ACPI operation region support for XPower AXP288 PMIC"
...meaning they currently are not being built as a module by anyone.
Lets remove the couple traces of modular infrastructure use, so that
when reading the code there is no doubt it is builtin-only.
We delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.
One file was using module_init. Since module_init translates to
device_initcall in the non-modular case, the init ordering remains
unchanged with this commit.
In one case we replace the module.h with export.h since that file
is exporting some symbols, but does not use __init. The other two
are using __init and so module.h gets replaced with init.h there.
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/acpi/pmic/intel_pmic.c | 4 +---
drivers/acpi/pmic/intel_pmic_bxtwc.c | 6 +-----
drivers/acpi/pmic/intel_pmic_xpower.c | 7 ++-----
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c
index 6585affc3e26..ca18e0d23df9 100644
--- a/drivers/acpi/pmic/intel_pmic.c
+++ b/drivers/acpi/pmic/intel_pmic.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/acpi.h>
#include <linux/regmap.h>
#include <acpi/acpi_lpat.h>
@@ -319,5 +319,3 @@ out_error:
return ret;
}
EXPORT_SYMBOL_GPL(intel_pmic_install_opregion_handler);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/pmic/intel_pmic_bxtwc.c b/drivers/acpi/pmic/intel_pmic_bxtwc.c
index ebe6f09e6910..90011aad4d20 100644
--- a/drivers/acpi/pmic/intel_pmic_bxtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_bxtwc.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/mfd/intel_soc_pmic.h>
#include <linux/regmap.h>
@@ -417,8 +417,4 @@ static int __init intel_bxtwc_pmic_opregion_driver_init(void)
{
return platform_driver_register(&intel_bxtwc_pmic_opregion_driver);
}
-
device_initcall(intel_bxtwc_pmic_opregion_driver_init);
-
-MODULE_DESCRIPTION("BXT WhiskeyCove ACPI opregion driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c
index 6a082d4de12c..e6e991ac20f3 100644
--- a/drivers/acpi/pmic/intel_pmic_xpower.c
+++ b/drivers/acpi/pmic/intel_pmic_xpower.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/mfd/axp20x.h>
#include <linux/regmap.h>
@@ -262,7 +262,4 @@ static int __init intel_xpower_pmic_opregion_driver_init(void)
{
return platform_driver_register(&intel_xpower_pmic_opregion_driver);
}
-module_init(intel_xpower_pmic_opregion_driver_init);
-
-MODULE_DESCRIPTION("XPower AXP288 ACPI operation region driver");
-MODULE_LICENSE("GPL");
+device_initcall(intel_xpower_pmic_opregion_driver_init);
--
2.8.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ACPI / PMIC: remove modular references from non-modular code
2016-07-11 22:05 [PATCH] ACPI / PMIC: remove modular references from non-modular code Paul Gortmaker
@ 2016-07-19 20:09 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2016-07-19 20:09 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, Len Brown, linux-acpi
On Monday, July 11, 2016 06:05:16 PM Paul Gortmaker wrote:
> The Kconfig currently controlling compilation of these files are:
>
> drivers/acpi/Kconfig:menuconfig PMIC_OPREGION
> drivers/acpi/Kconfig: bool "PMIC (Power Management Integrated Circuit) operation region support"
>
> drivers/acpi/Kconfig:config BXT_WC_PMIC_OPREGION
> drivers/acpi/Kconfig: bool "ACPI operation region support for BXT WhiskeyCove PMIC"
>
> drivers/acpi/Kconfig:config XPOWER_PMIC_OPREGION
> drivers/acpi/Kconfig: bool "ACPI operation region support for XPower AXP288 PMIC"
>
> ...meaning they currently are not being built as a module by anyone.
>
> Lets remove the couple traces of modular infrastructure use, so that
> when reading the code there is no doubt it is builtin-only.
>
> We delete the MODULE_LICENSE tag etc. since all that information
> is already contained at the top of the file in the comments.
>
> One file was using module_init. Since module_init translates to
> device_initcall in the non-modular case, the init ordering remains
> unchanged with this commit.
>
> In one case we replace the module.h with export.h since that file
> is exporting some symbols, but does not use __init. The other two
> are using __init and so module.h gets replaced with init.h there.
>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Len Brown <lenb@kernel.org>
> Cc: linux-acpi@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-19 20:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-11 22:05 [PATCH] ACPI / PMIC: remove modular references from non-modular code Paul Gortmaker
2016-07-19 20:09 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).