mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 17:33:01 +00:00
mfd: ab8500-core: Make it explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config AB8500_CORE drivers/mfd/Kconfig: bool "ST-Ericsson AB8500 Mixed Signal Power Management chip" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_init was not in use by this code, the init ordering remains unchanged with this commit. We replace module.h with moduleparam.h ; the latter since this file was implicitly relying on getting it. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
4be85fc4f8
commit
31cbae2224
@ -14,7 +14,7 @@
|
||||
#include <linux/irqdomain.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/mfd/core.h>
|
||||
#include <linux/mfd/abx500.h>
|
||||
@ -123,6 +123,10 @@ static DEFINE_SPINLOCK(on_stat_lock);
|
||||
static u8 turn_on_stat_mask = 0xFF;
|
||||
static u8 turn_on_stat_set;
|
||||
static bool no_bm; /* No battery management */
|
||||
/*
|
||||
* not really modular, but the easiest way to keep compat with existing
|
||||
* bootargs behaviour is to continue using module_param here.
|
||||
*/
|
||||
module_param(no_bm, bool, S_IRUGO);
|
||||
|
||||
#define AB9540_MODEM_CTRL2_REG 0x23
|
||||
@ -1324,25 +1328,6 @@ static int ab8500_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ab8500_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ab8500 *ab8500 = platform_get_drvdata(pdev);
|
||||
|
||||
if (((is_ab8505(ab8500) || is_ab9540(ab8500)) &&
|
||||
ab8500->chip_id >= AB8500_CUT2P0) || is_ab8540(ab8500))
|
||||
sysfs_remove_group(&ab8500->dev->kobj, &ab9540_attr_group);
|
||||
else
|
||||
sysfs_remove_group(&ab8500->dev->kobj, &ab8500_attr_group);
|
||||
|
||||
if ((is_ab8505(ab8500) || is_ab9540(ab8500)) &&
|
||||
ab8500->chip_id >= AB8500_CUT2P0)
|
||||
sysfs_remove_group(&ab8500->dev->kobj, &ab8505_attr_group);
|
||||
|
||||
mfd_remove_devices(ab8500->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct platform_device_id ab8500_id[] = {
|
||||
{ "ab8500-core", AB8500_VERSION_AB8500 },
|
||||
{ "ab8505-i2c", AB8500_VERSION_AB8505 },
|
||||
@ -1354,9 +1339,9 @@ static const struct platform_device_id ab8500_id[] = {
|
||||
static struct platform_driver ab8500_core_driver = {
|
||||
.driver = {
|
||||
.name = "ab8500-core",
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
.probe = ab8500_probe,
|
||||
.remove = ab8500_remove,
|
||||
.id_table = ab8500_id,
|
||||
};
|
||||
|
||||
@ -1364,14 +1349,4 @@ static int __init ab8500_core_init(void)
|
||||
{
|
||||
return platform_driver_register(&ab8500_core_driver);
|
||||
}
|
||||
|
||||
static void __exit ab8500_core_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&ab8500_core_driver);
|
||||
}
|
||||
core_initcall(ab8500_core_init);
|
||||
module_exit(ab8500_core_exit);
|
||||
|
||||
MODULE_AUTHOR("Mattias Wallin, Srinidhi Kasagar, Rabin Vincent");
|
||||
MODULE_DESCRIPTION("AB8500 MFD core");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
Loading…
Reference in New Issue
Block a user