Merge tag 'fixes-for-v3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / w90p910_ts.c

diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index 9396b21d0e8f953a45e5ac852ec65bbdb590854b..d2ef8f05c66ec968b382c054861db1b3e49d0ae9 100644 (file)
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -215,7 +215,7 @@ static void w90p910_close(struct input_dev *dev)
        clk_disable(w90p910_ts->clk);
 }
 
-static int __devinit w90x900ts_probe(struct platform_device *pdev)
+static int w90x900ts_probe(struct platform_device *pdev)
 {
        struct w90p910_ts *w90p910_ts;
        struct input_dev *input_dev;
@@ -301,7 +301,7 @@ fail1:      input_free_device(input_dev);
        return err;
 }
 
-static int __devexit w90x900ts_remove(struct platform_device *pdev)
+static int w90x900ts_remove(struct platform_device *pdev)
 {
        struct w90p910_ts *w90p910_ts = platform_get_drvdata(pdev);
        struct resource *res;
@@ -325,7 +325,7 @@ static int __devexit w90x900ts_remove(struct platform_device *pdev)
 
 static struct platform_driver w90x900ts_driver = {
        .probe          = w90x900ts_probe,
-       .remove         = __devexit_p(w90x900ts_remove),
+       .remove         = w90x900ts_remove,
        .driver         = {
                .name   = "nuc900-ts",
                .owner  = THIS_MODULE,