[PATCH 11/18] mfd: t7l66xb: Make it explicitly non-modular

From: Paul Gortmaker
Date: Wed Dec 18 2019 - 15:50:07 EST


The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_T7L66XB
drivers/mfd/Kconfig: bool "Toshiba T7L66XB"

...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_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Lee Jones <lee.jones@xxxxxxxxxx>
Cc: Ian Molton <spyro@xxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
---
drivers/mfd/t7l66xb.c | 37 ++++---------------------------------
1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 70da0c4ae457..636b9c8dc96d 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -20,7 +20,7 @@
*/

#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/slab.h>
@@ -403,42 +403,13 @@ static int t7l66xb_probe(struct platform_device *dev)
return ret;
}

-static int t7l66xb_remove(struct platform_device *dev)
-{
- struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
- struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
- int ret;
-
- ret = pdata->disable(dev);
- clk_disable_unprepare(t7l66xb->clk48m);
- clk_put(t7l66xb->clk48m);
- clk_disable_unprepare(t7l66xb->clk32k);
- clk_put(t7l66xb->clk32k);
- t7l66xb_detach_irq(dev);
- iounmap(t7l66xb->scr);
- release_resource(&t7l66xb->rscr);
- mfd_remove_devices(&dev->dev);
- kfree(t7l66xb);
-
- return ret;
-
-}
-
static struct platform_driver t7l66xb_platform_driver = {
.driver = {
- .name = "t7l66xb",
+ .name = "t7l66xb",
+ .suppress_bind_attrs = true,
},
.suspend = t7l66xb_suspend,
.resume = t7l66xb_resume,
.probe = t7l66xb_probe,
- .remove = t7l66xb_remove,
};
-
-/*--------------------------------------------------------------------------*/
-
-module_platform_driver(t7l66xb_platform_driver);
-
-MODULE_DESCRIPTION("Toshiba T7L66XB core driver");
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Ian Molton");
-MODULE_ALIAS("platform:t7l66xb");
+builtin_platform_driver(t7l66xb_platform_driver);
--
2.7.4