diff options
| author | Ladislav Michl | 2017-09-08 01:37:07 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-10-04 20:30:52 +0200 |
| commit | 52ea79910720c56420f58771b9790e257764e006 (patch) | |
| tree | c214da0898fbc72eb0cc996f27648cf0588966b6 | |
| parent | [media] media: rc: gpio-ir-recv: use devm_gpio_request_one (diff) | |
| download | kernel-qcow2-linux-52ea79910720c56420f58771b9790e257764e006.tar.gz kernel-qcow2-linux-52ea79910720c56420f58771b9790e257764e006.tar.xz kernel-qcow2-linux-52ea79910720c56420f58771b9790e257764e006.zip | |
[media] media: rc: gpio-ir-recv: use devm_rc_register_device
Use of devm_rc_register_device simplifies error unwinding.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/rc/gpio-ir-recv.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c index 77044d664371..ae5f9099c8a6 100644 --- a/drivers/media/rc/gpio-ir-recv.c +++ b/drivers/media/rc/gpio-ir-recv.c @@ -153,10 +153,10 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) if (rc < 0) return rc; - rc = rc_register_device(rcdev); + rc = devm_rc_register_device(dev, rcdev); if (rc < 0) { dev_err(dev, "failed to register rc device (%d)\n", rc); - goto err_register_rc_device; + return rc; } platform_set_drvdata(pdev, gpio_dev); @@ -171,9 +171,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) return 0; err_request_irq: - rc_unregister_device(rcdev); - rcdev = NULL; -err_register_rc_device: return rc; } @@ -182,7 +179,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev) struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev); free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev); - rc_unregister_device(gpio_dev->rcdev); return 0; } |