[PATCH 06/18] mfd: tc6387xb: Make it explicitly non-modular
From: Paul Gortmaker
Date: Wed Dec 18 2019 - 15:49:22 EST
The Kconfig currently controlling compilation of this code is:
drivers/mfd/Kconfig:config MFD_TC6387XB
drivers/mfd/Kconfig: bool "Toshiba TC6387XB"
...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/tc6387xb.c | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index c66a701ab21c..aa2eada4bf30 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -6,7 +6,7 @@
* This file contains TC6387XB base support.
*/
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/err.h>
@@ -199,35 +199,13 @@ static int tc6387xb_probe(struct platform_device *dev)
return ret;
}
-static int tc6387xb_remove(struct platform_device *dev)
-{
- struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
-
- mfd_remove_devices(&dev->dev);
- iounmap(tc6387xb->scr);
- release_resource(&tc6387xb->rscr);
- clk_disable_unprepare(tc6387xb->clk32k);
- clk_put(tc6387xb->clk32k);
- kfree(tc6387xb);
-
- return 0;
-}
-
-
static struct platform_driver tc6387xb_platform_driver = {
.driver = {
- .name = "tc6387xb",
+ .name = "tc6387xb",
+ .suppress_bind_attrs = true,
},
.probe = tc6387xb_probe,
- .remove = tc6387xb_remove,
.suspend = tc6387xb_suspend,
.resume = tc6387xb_resume,
};
-
-module_platform_driver(tc6387xb_platform_driver);
-
-MODULE_DESCRIPTION("Toshiba TC6387XB core driver");
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Ian Molton");
-MODULE_ALIAS("platform:tc6387xb");
-
+builtin_platform_driver(tc6387xb_platform_driver);
--
2.7.4