aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/88pm860x-ts.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/touchscreen/88pm860x-ts.c')
-rw-r--r--drivers/input/touchscreen/88pm860x-ts.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c
index 326218dbd6e..c7068942ebe 100644
--- a/drivers/input/touchscreen/88pm860x-ts.c
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -115,7 +115,7 @@ static void pm860x_touch_close(struct input_dev *dev)
115} 115}
116 116
117#ifdef CONFIG_OF 117#ifdef CONFIG_OF
118static int __devinit pm860x_touch_dt_init(struct platform_device *pdev, 118static int pm860x_touch_dt_init(struct platform_device *pdev,
119 struct pm860x_chip *chip, 119 struct pm860x_chip *chip,
120 int *res_x) 120 int *res_x)
121{ 121{
@@ -169,7 +169,7 @@ static int __devinit pm860x_touch_dt_init(struct platform_device *pdev,
169#define pm860x_touch_dt_init(x, y, z) (-1) 169#define pm860x_touch_dt_init(x, y, z) (-1)
170#endif 170#endif
171 171
172static int __devinit pm860x_touch_probe(struct platform_device *pdev) 172static int pm860x_touch_probe(struct platform_device *pdev)
173{ 173{
174 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); 174 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
175 struct pm860x_touch_pdata *pdata = pdev->dev.platform_data; 175 struct pm860x_touch_pdata *pdata = pdev->dev.platform_data;
@@ -293,7 +293,7 @@ out:
293 return ret; 293 return ret;
294} 294}
295 295
296static int __devexit pm860x_touch_remove(struct platform_device *pdev) 296static int pm860x_touch_remove(struct platform_device *pdev)
297{ 297{
298 struct pm860x_touch *touch = platform_get_drvdata(pdev); 298 struct pm860x_touch *touch = platform_get_drvdata(pdev);
299 299
@@ -310,7 +310,7 @@ static struct platform_driver pm860x_touch_driver = {
310 .owner = THIS_MODULE, 310 .owner = THIS_MODULE,
311 }, 311 },
312 .probe = pm860x_touch_probe, 312 .probe = pm860x_touch_probe,
313 .remove = __devexit_p(pm860x_touch_remove), 313 .remove = pm860x_touch_remove,
314}; 314};
315module_platform_driver(pm860x_touch_driver); 315module_platform_driver(pm860x_touch_driver);
316 316