diff options
| author | Sebastian Reichel <sre@debian.org> | 2013-10-12 20:23:07 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@debian.org> | 2013-10-12 23:53:28 +0200 |
| commit | 2ea5bb28bf3859c398b30f032fa6ec08e4ac5f9d (patch) | |
| tree | 87ca3b92c5df673112bf62ed255b5ef1217367aa | |
| parent | b49053762ad79e764d11cf6b208a6bcd7a053751 (diff) | |
| download | linux-2ea5bb28bf3859c398b30f032fa6ec08e4ac5f9d.tar.bz2 | |
Input: twl4030-pwrbutton: simplify driver using devm_*
Use managed irq resource to simplify the driver.
Signed-off-by: Sebastian Reichel <sre@debian.org>
| -rw-r--r-- | drivers/input/misc/twl4030-pwrbutton.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index 4e7a810b2550..4ab9243bb0f4 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c @@ -70,7 +70,7 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev) pwr->phys = "twl4030_pwrbutton/input0"; pwr->dev.parent = &pdev->dev; - err = request_threaded_irq(irq, NULL, powerbutton_irq, + err = devm_request_threaded_irq(&pwr->dev, irq, NULL, powerbutton_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "twl4030_pwrbutton", pwr); if (err < 0) { @@ -81,15 +81,13 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev) err = input_register_device(pwr); if (err) { dev_err(&pdev->dev, "Can't register power button: %d\n", err); - goto free_irq; + goto free_input_dev; } platform_set_drvdata(pdev, pwr); return 0; -free_irq: - free_irq(irq, pwr); free_input_dev: input_free_device(pwr); return err; @@ -98,9 +96,7 @@ free_input_dev: static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev) { struct input_dev *pwr = platform_get_drvdata(pdev); - int irq = platform_get_irq(pdev, 0); - free_irq(irq, pwr); input_unregister_device(pwr); return 0; |