Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3ef8d8 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Rafael J. Wysocki
Browse files

ACPI / PMIC: remove modular references from non-modular code 



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.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 730de199

drivers/acpi/pmic/intel_pmic.c

+1 −3
Original line number Diff line number Diff line
@@ -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 @@ int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, 
	return ret;

}

EXPORT_SYMBOL_GPL(intel_pmic_install_opregion_handler);
 


MODULE_LICENSE("GPL");

drivers/acpi/pmic/intel_pmic_bxtwc.c

+1 −5
Original line number Diff line number Diff line
@@ -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");

drivers/acpi/pmic/intel_pmic_xpower.c

+2 −5
Original line number Diff line number Diff line
@@ -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);