Linux Media Controller development
 help / color / mirror / Atom feed
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 v2 03/10] media: rc: gpio-ir-recv: use devm_rc_allocate_device
Date: Fri, 8 Sep 2017 01:36:11 +0200	[thread overview]
Message-ID: <20170907233611.p37c3hwsuoq2r73k@lenoch> (raw)
In-Reply-To: <20170907233355.bv3hsv3rfhcx52i3@lenoch>

Use of devm_rc_allocate_device simplifies error unwinding.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 -v2: rebased to current linux.git

 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 8f5e3a84a95e..ee191f26efb4 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -122,7 +122,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;
 
@@ -150,7 +150,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;
@@ -178,8 +178,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

  parent reply	other threads:[~2017-09-07 23:37 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20170907233401epcas4p4424e892b32d469233705af5014e20604@epcas4p4.samsung.com>
2017-09-07 23:33 ` [PATCH v2 00/10] media: rc: gpio-ir-recv: driver update Ladislav Michl
2017-09-07 23:34   ` [PATCH v2 01/10] media: rc: gpio-ir-recv: use helper vaiable to acess device info Ladislav Michl
2017-09-07 23:35   ` [PATCH v2 02/10] media: rc: gpio-ir-recv: use devm_kzalloc Ladislav Michl
2017-09-07 23:36   ` Ladislav Michl [this message]
2017-09-07 23:36   ` [PATCH v2 04/10] media: rc: gpio-ir-recv: use devm_gpio_request_one Ladislav Michl
2017-09-07 23:37   ` [PATCH v2 05/10] media: rc: gpio-ir-recv: use devm_rc_register_device Ladislav Michl
2017-09-07 23:37   ` [PATCH v2 06/10] media: rc: gpio-ir-recv: do not allow threaded interrupt handler Ladislav Michl
2017-09-07 23:38   ` [PATCH v2 07/10] media: rc: gpio-ir-recv: use devm_request_irq Ladislav Michl
2017-09-07 23:39   ` [PATCH v2 08/10] media: rc: gpio-ir-recv: use KBUILD_MODNAME Ladislav Michl
2017-09-07 23:39   ` [PATCH v2 09/10] media: rc: gpio-ir-recv: remove gpio_ir_recv_platform_data Ladislav Michl
2017-09-07 23:41   ` [PATCH v2 10/10] media: rc: gpio-ir-recv: use gpiolib API Ladislav Michl
2017-09-08  2:21   ` [PATCH v2 00/10] media: rc: gpio-ir-recv: driver update Andi Shyti
2017-09-08  8:16     ` Ladislav Michl
2017-09-11  2:58       ` Andi Shyti
2017-09-11  7:13         ` Ladislav Michl
2017-09-15 21:56           ` 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=20170907233611.p37c3hwsuoq2r73k@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