Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / input / touchscreen / ti_am335x_tsc.c

diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 7a18a8a15228683ccd8cba001f493f689040a936..51e7b87827a45ff0bd1c5335d2dc7b7b0ce70d8a 100644 (file)
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -258,7 +258,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
  * The functions for inserting/removing driver as a module.
  */
 
-static int __devinit titsc_probe(struct platform_device *pdev)
+static int titsc_probe(struct platform_device *pdev)
 {
        struct titsc *ts_dev;
        struct input_dev *input_dev;
@@ -327,7 +327,7 @@ err_free_mem:
        return err;
 }
 
-static int __devexit titsc_remove(struct platform_device *pdev)
+static int titsc_remove(struct platform_device *pdev)
 {
        struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data;
        struct titsc *ts_dev = tscadc_dev->tsc;
@@ -384,7 +384,7 @@ static const struct dev_pm_ops titsc_pm_ops = {
 
 static struct platform_driver ti_tsc_driver = {
        .probe  = titsc_probe,
-       .remove = __devexit_p(titsc_remove),
+       .remove = titsc_remove,
        .driver = {
                .name   = "tsc",
                .owner  = THIS_MODULE,