The Kconfig currently controlling compilation of this code is:
drivers/mfd/Kconfig:config MFD_MAX77693
drivers/mfd/Kconfig: bool "Maxim Semiconductor MAX77693 PMIC Support"
...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.
Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
We also delete the MODULE_LICENSE tag etc. since all that information
was contained at the top of the file in the comments.
Cc: Chanwoo Choi <cw00.c...@samsung.com>
Cc: Krzysztof Kozlowski <k.kozlow...@samsung.com>
Cc: Samuel Ortiz <sa...@linux.intel.com>
Cc: Lee Jones <lee.jo...@linaro.org>
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
drivers/mfd/max77693.c | 34 +++-------------------------------
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index b83b7a7da1ae..4126a55269d2 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -2,7 +2,7 @@
* max77693.c - mfd core driver for the MAX 77693
*
* Copyright (C) 2012 Samsung Electronics
- * SangYoung Son <hello....@smasung.com>
+ * SangYoung Son <hello....@samsung.com>
*
* This program is not provided / owned by Maxim Integrated Products.
*
@@ -23,7 +23,7 @@
* This driver is based on max8997.c
*/
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/err.h>
@@ -309,28 +309,10 @@ err_i2c_haptic:
return ret;
}
-static int max77693_i2c_remove(struct i2c_client *i2c)
-{
- struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
-
- mfd_remove_devices(max77693->dev);
-
- regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
- regmap_del_irq_chip(max77693->irq, max77693->irq_data_chg);
- regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys);
- regmap_del_irq_chip(max77693->irq, max77693->irq_data_led);
-
- i2c_unregister_device(max77693->i2c_muic);
- i2c_unregister_device(max77693->i2c_haptic);
-
- return 0;
-}
-
static const struct i2c_device_id max77693_i2c_id[] = {
{ "max77693", TYPE_MAX77693 },
{ }
};
-MODULE_DEVICE_TABLE(i2c, max77693_i2c_id);
static int max77693_suspend(struct device *dev)
{
@@ -374,10 +356,10 @@ static struct i2c_driver max77693_i2c_driver = {
.driver = {
.name = "max77693",
.pm = &max77693_pm,
+ .suppress_bind_attrs = true,
.of_match_table = of_match_ptr(max77693_dt_match),
},
.probe = max77693_i2c_probe,
- .remove = max77693_i2c_remove,
.id_table = max77693_i2c_id,
};
@@ -387,13 +369,3 @@ static int __init max77693_i2c_init(void)
}
/* init early so consumer devices can complete system boot */
subsys_initcall(max77693_i2c_init);
-
-static void __exit max77693_i2c_exit(void)
-{
- i2c_del_driver(&max77693_i2c_driver);
-}
-module_exit(max77693_i2c_exit);
-
-MODULE_DESCRIPTION("MAXIM 77693 multi-function core driver");
-MODULE_AUTHOR("SangYoung, Son <hello....@samsung.com>");
-MODULE_LICENSE("GPL");
--
2.8.0
