drivers/misc: make arm-charlcd.c explicitly non-modular

Commit Message

Paul Gortmaker Dec. 14, 2015, 1:07 a.m. UTC

The Kconfig currently controlling compilation of this code is:

drivers/misc/Kconfig:config ARM_CHARLCD
drivers/misc/Kconfig:   bool "ARM Ltd. Character LCD Driver"

...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 this driver did not have a ".remove"
function coded for non-modular drivers either.

Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.

We don't replace module.h with init.h since the file already has that.

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: Arnd Bergmann <[e-mail]>
Cc: Linus Walleij <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: [e-mail]
Signed-off-by: Paul Gortmaker <[e-mail]>
---

[ No 0/N lead in this time as drivers/misc only has one cleanup
  patch, but everyone on the Cc: knows what the 0/N boilerplate
  would say if it existed by now anyway... ]

 drivers/misc/arm-charlcd.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

Comments

Linus Walleij Dec. 15, 2015, 1:45 p.m. UTC | #1

On Mon, Dec 14, 2015 at 2:07 AM, Paul Gortmaker
<[e-mail]> wrote:

> The Kconfig currently controlling compilation of this code is:
>
> drivers/misc/Kconfig:config ARM_CHARLCD
> drivers/misc/Kconfig:   bool "ARM Ltd. Character LCD Driver"
>
> ...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 this driver did not have a ".remove"
> function coded for non-modular drivers either.
>
> Since module_platform_driver() uses the same init level priority as
> builtin_platform_driver() the init ordering remains unchanged with
> this commit.
>
> We don't replace module.h with init.h since the file already has that.
>
> 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: Arnd Bergmann <[e-mail]>
> Cc: Linus Walleij <[e-mail]>
> Cc: Greg Kroah-Hartman <[e-mail]>
> Cc: [e-mail]
> Signed-off-by: Paul Gortmaker <[e-mail]>

I would consider the modular code a copy/paste error. Unfortunately
not uncommon in the kernel :(

Reviewed-by: Linus Walleij <[e-mail]>

Thanks for doing this and keeping the kernel clean.

Yours,
Linus Walleij

Patch

diff --git a/drivers/misc/arm-charlcd.c b/drivers/misc/arm-charlcd.c
index c65b5ea5d5ef..b3176ee92b90 100644
--- a/drivers/misc/arm-charlcd.c
+++ b/drivers/misc/arm-charlcd.c
@@ -8,7 +8,6 @@ 
  * Author: Linus Walleij <[e-mail]>
  */
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
@@ -328,20 +327,6 @@  out_no_resource:
 	return ret;
 }
 
-static int __exit charlcd_remove(struct platform_device *pdev)
-{
-	struct charlcd *lcd = platform_get_drvdata(pdev);
-
-	if (lcd) {
-		free_irq(lcd->irq, lcd);
-		iounmap(lcd->virtbase);
-		release_mem_region(lcd->phybase, lcd->physize);
-		kfree(lcd);
-	}
-
-	return 0;
-}
-
 static int charlcd_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
@@ -376,13 +361,8 @@  static struct platform_driver charlcd_driver = {
 	.driver = {
 		.name = DRIVERNAME,
 		.pm = &charlcd_pm_ops,
+		.suppress_bind_attrs = true,
 		.of_match_table = of_match_ptr(charlcd_match),
 	},
-	.remove = __exit_p(charlcd_remove),
 };
-
-module_platform_driver_probe(charlcd_driver, charlcd_probe);
-
-MODULE_AUTHOR("Linus Walleij <[e-mail]>");
-MODULE_DESCRIPTION("ARM Character LCD Driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver_probe(charlcd_driver, charlcd_probe);