mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 5/7] commands: devlookup: use cdev_open_by_name()
Date: Thu, 16 May 2024 09:08:20 +0200	[thread overview]
Message-ID: <20240516070822.2746845-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20240516070822.2746845-1-s.hauer@pengutronix.de>

cdev_by_name() returns a cdev without increasing its reference count. In
order to maintain a proper reference counting use cdev_open_by_name()
instead and make sure it's closed afterwards when no longer needed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/devlookup.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/commands/devlookup.c b/commands/devlookup.c
index ffd6afbaba..bc9bd94614 100644
--- a/commands/devlookup.c
+++ b/commands/devlookup.c
@@ -25,7 +25,7 @@ static int do_devlookup(int argc, char *argv[])
 {
 	const char *variable = NULL, *devicefile, *paramname;
 	struct cdev *cdev;
-	int opt;
+	int opt, ret;
 
 	while ((opt = getopt(argc, argv, "v:")) > 0) {
 		switch(opt) {
@@ -43,7 +43,7 @@ static int do_devlookup(int argc, char *argv[])
 
 	devicefile = devpath_to_name(devicefile);
 
-	cdev = cdev_by_name(devicefile);
+	cdev = cdev_open_by_name(devicefile, O_RDONLY);
 	if (!cdev) {
 		printf("devlookup: cdev %s not found\n", devicefile);
 		return -ENOENT;
@@ -51,13 +51,18 @@ static int do_devlookup(int argc, char *argv[])
 
 	if (!cdev->dev) {
 		printf("devlookup: cdev %s not associated with a device\n", devicefile);
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out;
 	}
 
 	if (paramname)
-		return report(variable, dev_get_param(cdev->dev, paramname));
+		ret = report(variable, dev_get_param(cdev->dev, paramname));
+	else
+		ret = report(variable, dev_name(cdev->dev));
+out:
+	cdev_close(cdev);
 
-	return report(variable, dev_name(cdev->dev));
+	return ret;
 }
 
 BAREBOX_CMD_HELP_START(devlookup)
-- 
2.39.2




  parent reply	other threads:[~2024-05-16  7:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-16  7:08 [PATCH 0/7] replace cdev_by_name() with cdev_open_by_name() Sascha Hauer
2024-05-16  7:08 ` [PATCH 1/7] ARM: Freescale i.MX23 evk: use cdev_open_by_name() Sascha Hauer
2024-05-16  7:08 ` [PATCH 2/7] ARM: tx28: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 3/7] ARM: omap: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 4/7] ARM: Rockchip: " Sascha Hauer
2024-05-16  7:08 ` Sascha Hauer [this message]
2024-05-16  7:08 ` [PATCH 6/7] commands: findmnt: " Sascha Hauer
2024-05-16  7:08 ` [PATCH 7/7] bootm: " Sascha Hauer
2024-05-16 14:43 ` [PATCH 0/7] replace cdev_by_name() with cdev_open_by_name() Marco Felsch
2024-05-16 15:01   ` Sascha Hauer
2024-05-21  6:17 ` Sascha Hauer

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=20240516070822.2746845-6-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.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