Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...

[~andy/linux] / drivers / input / misc / gpio_tilt_polled.c

diff --git a/drivers/input/misc/gpio_tilt_polled.c b/drivers/input/misc/gpio_tilt_polled.c
index 277a0574c199c7b06ae90fe16167aaf84d9c2498..da05cca8b5622a3576be39b44149ca3cb02ebf11 100644 (file)
--- a/drivers/input/misc/gpio_tilt_polled.c
+++ b/drivers/input/misc/gpio_tilt_polled.c
@@ -96,7 +96,7 @@ static void gpio_tilt_polled_close(struct input_polled_dev *dev)
                pdata->disable(tdev->dev);
 }
 
-static int __devinit gpio_tilt_polled_probe(struct platform_device *pdev)
+static int gpio_tilt_polled_probe(struct platform_device *pdev)
 {
        const struct gpio_tilt_platform_data *pdata = pdev->dev.platform_data;
        struct device *dev = &pdev->dev;
@@ -179,7 +179,7 @@ err_free_tdev:
        return error;
 }
 
-static int __devexit gpio_tilt_polled_remove(struct platform_device *pdev)
+static int gpio_tilt_polled_remove(struct platform_device *pdev)
 {
        struct gpio_tilt_polled_dev *tdev = platform_get_drvdata(pdev);
        const struct gpio_tilt_platform_data *pdata = tdev->pdata;
@@ -198,7 +198,7 @@ static int __devexit gpio_tilt_polled_remove(struct platform_device *pdev)
 
 static struct platform_driver gpio_tilt_polled_driver = {
        .probe  = gpio_tilt_polled_probe,
-       .remove = __devexit_p(gpio_tilt_polled_remove),
+       .remove = gpio_tilt_polled_remove,
        .driver = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,