Merge tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / gpio / gpio-timberdale.c

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 85ed608..181f86c 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -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);