From: Ladislav Michl <ladis@linux-mips.org>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sean Young <sean@mess.org>, Andi Shyti <andi.shyti@samsung.com>
Subject: [PATCH 03/10] media: rc: gpio-ir-recv: use devm_rc_allocate_device
Date: Wed, 6 Sep 2017 10:10:14 +0200 [thread overview]
Message-ID: <20170906081014.jmw256c4q344isql@lenoch> (raw)
In-Reply-To: <20170906080748.wgxbmunfsu33bd6x@lenoch>
Use of devm_rc_allocate_device simplifies error unwinding.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/media/rc/gpio-ir-recv.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index fd5742b23447..0e0b6988c08e 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -143,7 +143,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
if (!gpio_dev)
return -ENOMEM;
- rcdev = rc_allocate_device(RC_DRIVER_IR_RAW);
+ rcdev = devm_rc_allocate_device(dev, RC_DRIVER_IR_RAW);
if (!rcdev)
return -ENOMEM;
@@ -174,7 +174,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
rc = gpio_request(pdata->gpio_nr, "gpio-ir-recv");
if (rc < 0)
- goto err_gpio_request;
+ return rc;
rc = gpio_direction_input(pdata->gpio_nr);
if (rc < 0)
goto err_gpio_direction_input;
@@ -202,8 +202,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
err_register_rc_device:
err_gpio_direction_input:
gpio_free(pdata->gpio_nr);
-err_gpio_request:
- rc_free_device(rcdev);
return rc;
}
--
2.11.0
next prev parent reply other threads:[~2017-09-06 8:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 8:07 [PATCH 00/10] media: rc: gpio-ir-recv: driver update Ladislav Michl
2017-09-06 8:08 ` [PATCH 01/10] media: rc: gpio-ir-recv: use helper vaiable to acess device info Ladislav Michl
2017-09-06 8:09 ` [PATCH 02/10] media: rc: gpio-ir-recv: use devm_kzalloc Ladislav Michl
2017-09-06 8:10 ` Ladislav Michl [this message]
2017-09-06 8:10 ` [PATCH 04/10] media: rc: gpio-ir-recv: use devm_gpio_request_one Ladislav Michl
2017-09-06 8:11 ` [PATCH 05/10] media: rc: gpio-ir-recv: use devm_rc_register_device Ladislav Michl
2017-09-06 8:12 ` [PATCH 06/10] media: rc: gpio-ir-recv: do not allow threaded interrupt handler Ladislav Michl
2017-09-06 8:12 ` [PATCH 07/10] media: rc: gpio-ir-recv: use devm_request_irq Ladislav Michl
2017-09-06 8:13 ` [PATCH 08/10] media: rc: gpio-ir-recv: use KBUILD_MODNAME Ladislav Michl
2017-09-06 8:14 ` [PATCH 09/10] media: rc: gpio-ir-recv: remove gpio_ir_recv_platform_data Ladislav Michl
2017-09-06 8:15 ` [PATCH 10/10] media: rc: gpio-ir-recv: use gpiolib API Ladislav Michl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170906081014.jmw256c4q344isql@lenoch \
--to=ladis@linux-mips.org \
--cc=andi.shyti@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sean@mess.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox