Commit eb735d3b authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: pmic8xxx-pwrkey - switch to using managed resources

This simplifies error handling and device removal paths.
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e77a715a
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
* @key_press_irq: key press irq number * @key_press_irq: key press irq number
*/ */
struct pmic8xxx_pwrkey { struct pmic8xxx_pwrkey {
struct input_dev *pwr;
int key_press_irq; int key_press_irq;
}; };
...@@ -110,22 +109,22 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) ...@@ -110,22 +109,22 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
pwrkey = kzalloc(sizeof(*pwrkey), GFP_KERNEL); pwrkey = devm_kzalloc(&pdev->dev, sizeof(*pwrkey), GFP_KERNEL);
if (!pwrkey) if (!pwrkey)
return -ENOMEM; return -ENOMEM;
pwr = input_allocate_device(); pwrkey->key_press_irq = key_press_irq;
pwr = devm_input_allocate_device(&pdev->dev);
if (!pwr) { if (!pwr) {
dev_dbg(&pdev->dev, "Can't allocate power button\n"); dev_dbg(&pdev->dev, "Can't allocate power button\n");
err = -ENOMEM; return -ENOMEM;
goto free_pwrkey;
} }
input_set_capability(pwr, EV_KEY, KEY_POWER); input_set_capability(pwr, EV_KEY, KEY_POWER);
pwr->name = "pmic8xxx_pwrkey"; pwr->name = "pmic8xxx_pwrkey";
pwr->phys = "pmic8xxx_pwrkey/input0"; pwr->phys = "pmic8xxx_pwrkey/input0";
pwr->dev.parent = &pdev->dev;
delay = (pdata->kpd_trigger_delay_us << 10) / USEC_PER_SEC; delay = (pdata->kpd_trigger_delay_us << 10) / USEC_PER_SEC;
delay = 1 + ilog2(delay); delay = 1 + ilog2(delay);
...@@ -133,7 +132,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) ...@@ -133,7 +132,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
err = regmap_read(regmap, PON_CNTL_1, &pon_cntl); err = regmap_read(regmap, PON_CNTL_1, &pon_cntl);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed reading PON_CNTL_1 err=%d\n", err); dev_err(&pdev->dev, "failed reading PON_CNTL_1 err=%d\n", err);
goto free_input_dev; return err;
} }
pon_cntl &= ~PON_CNTL_TRIG_DELAY_MASK; pon_cntl &= ~PON_CNTL_TRIG_DELAY_MASK;
...@@ -146,66 +145,43 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) ...@@ -146,66 +145,43 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
err = regmap_write(regmap, PON_CNTL_1, pon_cntl); err = regmap_write(regmap, PON_CNTL_1, pon_cntl);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed writing PON_CNTL_1 err=%d\n", err); dev_err(&pdev->dev, "failed writing PON_CNTL_1 err=%d\n", err);
goto free_input_dev; return err;
} }
err = input_register_device(pwr); err = devm_request_irq(&pdev->dev, key_press_irq, pwrkey_press_irq,
IRQF_TRIGGER_RISING,
"pmic8xxx_pwrkey_press", pwr);
if (err) { if (err) {
dev_dbg(&pdev->dev, "Can't register power key: %d\n", err); dev_err(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n",
goto free_input_dev;
}
pwrkey->key_press_irq = key_press_irq;
pwrkey->pwr = pwr;
platform_set_drvdata(pdev, pwrkey);
err = request_irq(key_press_irq, pwrkey_press_irq,
IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwr);
if (err < 0) {
dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n",
key_press_irq, err); key_press_irq, err);
goto unreg_input_dev; return err;
} }
err = request_irq(key_release_irq, pwrkey_release_irq, err = devm_request_irq(&pdev->dev, key_release_irq, pwrkey_release_irq,
IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwr); IRQF_TRIGGER_RISING,
if (err < 0) { "pmic8xxx_pwrkey_release", pwr);
dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", if (err) {
dev_err(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n",
key_release_irq, err); key_release_irq, err);
return err;
}
goto free_press_irq; err = input_register_device(pwr);
if (err) {
dev_err(&pdev->dev, "Can't register power key: %d\n", err);
return err;
} }
platform_set_drvdata(pdev, pwrkey);
device_init_wakeup(&pdev->dev, pdata->wakeup); device_init_wakeup(&pdev->dev, pdata->wakeup);
return 0; return 0;
free_press_irq:
free_irq(key_press_irq, pwr);
unreg_input_dev:
input_unregister_device(pwr);
pwr = NULL;
free_input_dev:
input_free_device(pwr);
free_pwrkey:
kfree(pwrkey);
return err;
} }
static int pmic8xxx_pwrkey_remove(struct platform_device *pdev) static int pmic8xxx_pwrkey_remove(struct platform_device *pdev)
{ {
struct pmic8xxx_pwrkey *pwrkey = platform_get_drvdata(pdev);
int key_release_irq = platform_get_irq(pdev, 0);
int key_press_irq = platform_get_irq(pdev, 1);
device_init_wakeup(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0);
free_irq(key_press_irq, pwrkey->pwr);
free_irq(key_release_irq, pwrkey->pwr);
input_unregister_device(pwrkey->pwr);
kfree(pwrkey);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment