aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/touchscreen/88pm860x-ts.c2
-rw-r--r--drivers/input/touchscreen/atmel_tsadcc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c
index e8d457266b71..f7de14a268bf 100644
--- a/drivers/input/touchscreen/88pm860x-ts.c
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -237,7 +237,7 @@ static int pm860x_touch_probe(struct platform_device *pdev)
237 touch = kzalloc(sizeof(struct pm860x_touch), GFP_KERNEL); 237 touch = kzalloc(sizeof(struct pm860x_touch), GFP_KERNEL);
238 if (touch == NULL) 238 if (touch == NULL)
239 return -ENOMEM; 239 return -ENOMEM;
240 dev_set_drvdata(&pdev->dev, touch); 240 platform_set_drvdata(pdev, touch);
241 241
242 touch->idev = input_allocate_device(); 242 touch->idev = input_allocate_device();
243 if (touch->idev == NULL) { 243 if (touch->idev == NULL) {
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index 95f6785a94b0..75a0693a3f91 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -325,7 +325,7 @@ err_free_mem:
325 325
326static int atmel_tsadcc_remove(struct platform_device *pdev) 326static int atmel_tsadcc_remove(struct platform_device *pdev)
327{ 327{
328 struct atmel_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev); 328 struct atmel_tsadcc *ts_dev = platform_get_drvdata(pdev);
329 struct resource *res; 329 struct resource *res;
330 330
331 free_irq(ts_dev->irq, ts_dev); 331 free_irq(ts_dev->irq, ts_dev);