gpio: remove use of __devexit

[deliverable/linux.git] / drivers / gpio / gpio-janz-ttl.c

diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index f2f000dd70b369423517ace20da9ae57cc0d3600..7d0a04169a351ba54b0b53b67a0d587063da5bd7 100644 (file)
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -108,13 +108,13 @@ static void ttl_set_value(struct gpio_chip *gpio, unsigned offset, int value)
        spin_unlock(&mod->lock);
 }
 
-static void __devinit ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
+static void ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
 {
        iowrite16be(reg, &mod->regs->control);
        iowrite16be(val, &mod->regs->control);
 }
 
-static void __devinit ttl_setup_device(struct ttl_module *mod)
+static void ttl_setup_device(struct ttl_module *mod)
 {
        /* reset the device to a known state */
        iowrite16be(0x0000, &mod->regs->control);
@@ -140,7 +140,7 @@ static void __devinit ttl_setup_device(struct ttl_module *mod)
        ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);
 }
 
-static int __devinit ttl_probe(struct platform_device *pdev)
+static int ttl_probe(struct platform_device *pdev)
 {
        struct janz_platform_data *pdata;
        struct device *dev = &pdev->dev;
@@ -211,7 +211,7 @@ out_return:
        return ret;
 }
 
-static int __devexit ttl_remove(struct platform_device *pdev)
+static int ttl_remove(struct platform_device *pdev)
 {
        struct ttl_module *mod = platform_get_drvdata(pdev);
        struct device *dev = &pdev->dev;
@@ -234,7 +234,7 @@ static struct platform_driver ttl_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = ttl_probe,
-       .remove         = __devexit_p(ttl_remove),
+       .remove         = ttl_remove,
 };
 
 module_platform_driver(ttl_driver);