aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/gpio_mouse.c2
-rw-r--r--drivers/input/mouse/pxa930_trkball.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 6b44413f54e3..6810a4626a2a 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -48,7 +48,7 @@ static void gpio_mouse_scan(struct input_polled_dev *dev)
48 48
49static int gpio_mouse_probe(struct platform_device *pdev) 49static int gpio_mouse_probe(struct platform_device *pdev)
50{ 50{
51 struct gpio_mouse_platform_data *pdata = pdev->dev.platform_data; 51 struct gpio_mouse_platform_data *pdata = dev_get_platdata(&pdev->dev);
52 struct input_polled_dev *input_poll; 52 struct input_polled_dev *input_poll;
53 struct input_dev *input; 53 struct input_dev *input;
54 int pin, i; 54 int pin, i;
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c
index 0ecb9e7945eb..d20d2ae5f1ee 100644
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
@@ -166,7 +166,7 @@ static int pxa930_trkball_probe(struct platform_device *pdev)
166 if (!trkball) 166 if (!trkball)
167 return -ENOMEM; 167 return -ENOMEM;
168 168
169 trkball->pdata = pdev->dev.platform_data; 169 trkball->pdata = dev_get_platdata(&pdev->dev);
170 if (!trkball->pdata) { 170 if (!trkball->pdata) {
171 dev_err(&pdev->dev, "no platform data defined\n"); 171 dev_err(&pdev->dev, "no platform data defined\n");
172 error = -EINVAL; 172 error = -EINVAL;