mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Marco Felsch <m.felsch@pengutronix.de>,
	Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 07/19] driver: add new cdev_is_partition helper
Date: Wed,  7 Jun 2023 14:07:02 +0200	[thread overview]
Message-ID: <20230607120714.3083182-8-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230607120714.3083182-1-a.fatoum@pengutronix.de>

Partitions will have cdev->master != NULL, so often code will just do
if (cdev->master) to check if a cdev is a partition. This is suboptimal
as it may be misinterpreted by readers as meaning that the cdev is the
master device, while it's the other way round.

Let's define cdev_is_partition instead and use it everywhere, where
cdev->master is only checked, but not dereferenced.

Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - Add Marco's Reviewed-by
---
 drivers/base/driver.c |  2 +-
 fs/devfs-core.c       | 10 +++++-----
 include/driver.h      |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index f00be99cdcbf..10d765e1a213 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -277,7 +277,7 @@ int unregister_device(struct device *old_dev)
 	}
 
 	list_for_each_entry_safe(cdev, ct, &old_dev->cdevs, devices_list) {
-		if (cdev->master) {
+		if (cdev_is_partition(cdev)) {
 			dev_dbg(old_dev, "unregister part %s\n", cdev->name);
 			devfs_del_partition(cdev->name);
 		}
diff --git a/fs/devfs-core.c b/fs/devfs-core.c
index 68a41ed20dd1..7525fd7f49cb 100644
--- a/fs/devfs-core.c
+++ b/fs/devfs-core.c
@@ -38,7 +38,7 @@ int devfs_partition_complete(struct string_list *sl, char *instr)
 	len = strlen(instr);
 
 	for_each_cdev(cdev) {
-		if (cdev->master &&
+		if (cdev_is_partition(cdev) &&
 		    !strncmp(instr, cdev->name, len)) {
 			string_list_add_asprintf(sl, "%s ", cdev->name);
 		}
@@ -104,7 +104,7 @@ struct cdev *cdev_by_partuuid(const char *partuuid)
 		return NULL;
 
 	for_each_cdev(cdev) {
-		if (cdev->master && !strcasecmp(cdev->uuid, partuuid))
+		if (cdev_is_partition(cdev) && !strcasecmp(cdev->uuid, partuuid))
 			return cdev;
 	}
 	return NULL;
@@ -118,7 +118,7 @@ struct cdev *cdev_by_diskuuid(const char *diskuuid)
 		return NULL;
 
 	for_each_cdev(cdev) {
-		if (!cdev->master && !strcasecmp(cdev->uuid, diskuuid))
+		if (!cdev_is_partition(cdev) && !strcasecmp(cdev->uuid, diskuuid))
 			return cdev;
 	}
 	return NULL;
@@ -396,7 +396,7 @@ int devfs_remove(struct cdev *cdev)
 	list_for_each_entry_safe(c, tmp, &cdev->links, link_entry)
 		devfs_remove(c);
 
-	if (cdev->master)
+	if (cdev_is_partition(cdev))
 		list_del(&cdev->partition_entry);
 
 	if (cdev->link)
@@ -552,7 +552,7 @@ int devfs_del_partition(const char *name)
 		return ret;
 	}
 
-	if (!cdev->master)
+	if (!cdev_is_partition(cdev))
 		return -EINVAL;
 	if (cdev->flags & DEVFS_PARTITION_FIXED)
 		return -EPERM;
diff --git a/include/driver.h b/include/driver.h
index 66ae52d0004c..22dba61439cd 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -564,6 +564,10 @@ int cdev_discard_range(struct cdev*, loff_t count, loff_t offset);
 int cdev_memmap(struct cdev*, void **map, int flags);
 int cdev_truncate(struct cdev*, size_t size);
 loff_t cdev_unallocated_space(struct cdev *cdev);
+static inline bool cdev_is_partition(const struct cdev *cdev)
+{
+	return cdev->master != NULL;
+}
 
 extern struct list_head cdev_list;
 #define for_each_cdev(cdev) \
-- 
2.39.2




  parent reply	other threads:[~2023-06-07 12:08 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07 12:06 [PATCH v2 00/19] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-06-07 12:06 ` [PATCH v2 01/19] common: partitions: decouple from EFI GUID definition Ahmad Fatoum
2023-06-07 12:06 ` [PATCH v2 02/19] efi: define efi_guid_t as 32-bit aligned guid_t Ahmad Fatoum
2023-06-07 12:06 ` [PATCH v2 03/19] cdev: fix for_each_cdev macro Ahmad Fatoum
2023-06-07 12:06 ` [PATCH v2 04/19] of: partition: support of_partition_ensure_probed on parent device Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 05/19] state: fix deep probe handling Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 06/19] of: of_path: always call of_partition_ensure_probed before resolving Ahmad Fatoum
2023-06-07 12:07 ` Ahmad Fatoum [this message]
2023-06-07 12:07 ` [PATCH v2 08/19] commands: stat: remove code duplication for type info Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 09/19] cdev: use more descriptive struct cdev::diskuuid/partuuid Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 10/19] cdev: record whether partition is parsed from OF Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 11/19] cdev: have devfs_add_partition return existing identical partition, not NULL Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 12/19] block: parse partition table on block device registration Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 13/19] common: partitions: record whether disk is GPT or MBR partitioned Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 14/19] block: add cdev_is_block_(device|partition|disk) helpers Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 15/19] of: export new of_cdev_find helper Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 16/19] state: factor device path lookup into helper function Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 17/19] cdev: use cdev::dos_partition_type only if cdev_is_mbr_partitioned Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 18/19] common: partitions: efi: record type UUID in cdev Ahmad Fatoum
2023-06-07 12:07 ` [PATCH v2 19/19] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-06-08  6:53 ` [PATCH v2 00/19] " 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=20230607120714.3083182-8-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.felsch@pengutronix.de \
    /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