leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] media: rc: gpio-ir-recv: use devm_rc_register_device

Browse Source 
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>
This commit is contained in:
Ladislav Michl 2017-09-07 20:37:07 -03:00 committed by Mauro Carvalho Chehab
parent fcca09edb9
commit 52ea799107
1 changed files with 2 additions and 6 deletions

8
drivers/media/rc/gpio-ir-recv.c
View File

@ -153,10 +153,10 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
if (rc < 0) if (rc < 0)
return rc; return rc;
rc = rc_register_device(rcdev); rc = devm_rc_register_device(dev, rcdev);
if (rc < 0) { if (rc < 0) {
dev_err(dev, "failed to register rc device (%d)\n", rc); dev_err(dev, "failed to register rc device (%d)\n", rc);
goto err_register_rc_device; return rc;
} }
platform_set_drvdata(pdev, gpio_dev); platform_set_drvdata(pdev, gpio_dev);
@ -171,9 +171,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
return 0; return 0;
err_request_irq: err_request_irq:
rc_unregister_device(rcdev);
rcdev = NULL;
err_register_rc_device:
return rc; 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); struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);
free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev); free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev);
rc_unregister_device(gpio_dev->rcdev);
return 0; return 0;
} }