diff options
-rw-r--r-- | drivers/input/misc/pmic8xxx-pwrkey.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c index b49b738aa9c6..d618c58f8a22 100644 --- a/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/drivers/input/misc/pmic8xxx-pwrkey.c | |||
@@ -36,22 +36,22 @@ struct pmic8xxx_pwrkey { | |||
36 | int key_press_irq; | 36 | int key_press_irq; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | static irqreturn_t pwrkey_press_irq(int irq, void *_pwrkey) | 39 | static irqreturn_t pwrkey_press_irq(int irq, void *_pwr) |
40 | { | 40 | { |
41 | struct pmic8xxx_pwrkey *pwrkey = _pwrkey; | 41 | struct input_dev *pwr = _pwr; |
42 | 42 | ||
43 | input_report_key(pwrkey->pwr, KEY_POWER, 1); | 43 | input_report_key(pwr, KEY_POWER, 1); |
44 | input_sync(pwrkey->pwr); | 44 | input_sync(pwr); |
45 | 45 | ||
46 | return IRQ_HANDLED; | 46 | return IRQ_HANDLED; |
47 | } | 47 | } |
48 | 48 | ||
49 | static irqreturn_t pwrkey_release_irq(int irq, void *_pwrkey) | 49 | static irqreturn_t pwrkey_release_irq(int irq, void *_pwr) |
50 | { | 50 | { |
51 | struct pmic8xxx_pwrkey *pwrkey = _pwrkey; | 51 | struct input_dev *pwr = _pwr; |
52 | 52 | ||
53 | input_report_key(pwrkey->pwr, KEY_POWER, 0); | 53 | input_report_key(pwr, KEY_POWER, 0); |
54 | input_sync(pwrkey->pwr); | 54 | input_sync(pwr); |
55 | 55 | ||
56 | return IRQ_HANDLED; | 56 | return IRQ_HANDLED; |
57 | } | 57 | } |
@@ -154,7 +154,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) | |||
154 | platform_set_drvdata(pdev, pwrkey); | 154 | platform_set_drvdata(pdev, pwrkey); |
155 | 155 | ||
156 | err = request_irq(key_press_irq, pwrkey_press_irq, | 156 | err = request_irq(key_press_irq, pwrkey_press_irq, |
157 | IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwrkey); | 157 | IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwr); |
158 | if (err < 0) { | 158 | if (err < 0) { |
159 | dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", | 159 | dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", |
160 | key_press_irq, err); | 160 | key_press_irq, err); |
@@ -162,7 +162,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | err = request_irq(key_release_irq, pwrkey_release_irq, | 164 | err = request_irq(key_release_irq, pwrkey_release_irq, |
165 | IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwrkey); | 165 | IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwr); |
166 | if (err < 0) { | 166 | if (err < 0) { |
167 | dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", | 167 | dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", |
168 | key_release_irq, err); | 168 | key_release_irq, err); |
@@ -194,8 +194,8 @@ static int pmic8xxx_pwrkey_remove(struct platform_device *pdev) | |||
194 | 194 | ||
195 | device_init_wakeup(&pdev->dev, 0); | 195 | device_init_wakeup(&pdev->dev, 0); |
196 | 196 | ||
197 | free_irq(key_press_irq, pwrkey); | 197 | free_irq(key_press_irq, pwrkey->pwr); |
198 | free_irq(key_release_irq, pwrkey); | 198 | free_irq(key_release_irq, pwrkey->pwr); |
199 | input_unregister_device(pwrkey->pwr); | 199 | input_unregister_device(pwrkey->pwr); |
200 | kfree(pwrkey); | 200 | kfree(pwrkey); |
201 | 201 | ||