]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: timberdale: make it explicitly non-modular
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 9 May 2016 23:59:57 +0000 (19:59 -0400)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 11 May 2016 11:49:11 +0000 (13:49 +0200)
The Kconfig currently controlling compilation of this code is:

drivers/gpio/Kconfig:config GPIO_TIMBERDALE
drivers/gpio/Kconfig:   bool "Support for timberdale GPIO IP"

...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
was (or is now) contained at the top of the file in the comments.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-timberdale.c

index 85ed608c2b272db3a92faee013391ebafd4659f4..181f86ce00cd46417b717edfdcdfddfee3053db1 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Timberdale FPGA GPIO driver
+ * Author: Mocean Laboratories
  * Copyright (c) 2009 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +21,7 @@
  * Timberdale FPGA GPIO
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
@@ -290,40 +291,14 @@ static int timbgpio_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int timbgpio_remove(struct platform_device *pdev)
-{
-       struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
-       struct timbgpio *tgpio = platform_get_drvdata(pdev);
-       int irq = platform_get_irq(pdev, 0);
-
-       if (irq >= 0 && tgpio->irq_base > 0) {
-               int i;
-               for (i = 0; i < pdata->nr_pins; i++) {
-                       irq_set_chip(tgpio->irq_base + i, NULL);
-                       irq_set_chip_data(tgpio->irq_base + i, NULL);
-               }
-
-               irq_set_handler(irq, NULL);
-               irq_set_handler_data(irq, NULL);
-       }
-
-       return 0;
-}
-
 static struct platform_driver timbgpio_platform_driver = {
        .driver = {
-               .name   = DRIVER_NAME,
+               .name                   = DRIVER_NAME,
+               .suppress_bind_attrs    = true,
        },
        .probe          = timbgpio_probe,
-       .remove         = timbgpio_remove,
 };
 
 /*--------------------------------------------------------------------------*/
 
-module_platform_driver(timbgpio_platform_driver);
-
-MODULE_DESCRIPTION("Timberdale GPIO driver");
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Mocean Laboratories");
-MODULE_ALIAS("platform:"DRIVER_NAME);
-
+builtin_platform_driver(timbgpio_platform_driver);