aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/pcf50633-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/misc/pcf50633-input.c')
-rw-r--r--drivers/input/misc/pcf50633-input.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c
index 039dcb00ebd9..95562735728d 100644
--- a/drivers/input/misc/pcf50633-input.c
+++ b/drivers/input/misc/pcf50633-input.c
@@ -20,6 +20,7 @@
20#include <linux/device.h> 20#include <linux/device.h>
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/input.h> 22#include <linux/input.h>
23#include <linux/slab.h>
23 24
24#include <linux/mfd/pcf50633/core.h> 25#include <linux/mfd/pcf50633/core.h>
25 26
@@ -55,7 +56,6 @@ pcf50633_input_irq(int irq, void *data)
55static int __devinit pcf50633_input_probe(struct platform_device *pdev) 56static int __devinit pcf50633_input_probe(struct platform_device *pdev)
56{ 57{
57 struct pcf50633_input *input; 58 struct pcf50633_input *input;
58 struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data;
59 struct input_dev *input_dev; 59 struct input_dev *input_dev;
60 int ret; 60 int ret;
61 61
@@ -71,7 +71,7 @@ static int __devinit pcf50633_input_probe(struct platform_device *pdev)
71 } 71 }
72 72
73 platform_set_drvdata(pdev, input); 73 platform_set_drvdata(pdev, input);
74 input->pcf = pdata->pcf; 74 input->pcf = dev_to_pcf50633(pdev->dev.parent);
75 input->input_dev = input_dev; 75 input->input_dev = input_dev;
76 76
77 input_dev->name = "PCF50633 PMU events"; 77 input_dev->name = "PCF50633 PMU events";
@@ -85,9 +85,9 @@ static int __devinit pcf50633_input_probe(struct platform_device *pdev)
85 kfree(input); 85 kfree(input);
86 return ret; 86 return ret;
87 } 87 }
88 pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYR, 88 pcf50633_register_irq(input->pcf, PCF50633_IRQ_ONKEYR,
89 pcf50633_input_irq, input); 89 pcf50633_input_irq, input);
90 pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYF, 90 pcf50633_register_irq(input->pcf, PCF50633_IRQ_ONKEYF,
91 pcf50633_input_irq, input); 91 pcf50633_input_irq, input);
92 92
93 return 0; 93 return 0;