Skip to contentSkip to conversation

scsi: ufs: ufshcd-pltfrm: Use of_property_count_u32_elems() to get property length

PATCH Applied Rob Herring (Arm) 3 participants 3 messages Aug 8, 2024 – Aug 12, 2024 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scsi: ufs: ufshcd-pltfrm: Use of_property_count_u32_elems() to get property length

Replace of_get_property() with the type specific of_property_count_u32_elems() to get the property length.

This is part of a larger effort to remove callers of of_get_property() and similar functions. of_get_property() leaks the DT property data pointer which is a problem for dynamically allocated nodes which may be freed.

---
v2:
- Update subject to include 'ufshcd-pltfrm'

---
 drivers/ufs/host/ufshcd-pltfrm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/ufs/host/ufshcd-pltfrm.c +2 -6
index 2e1eb898a27c..0c9b303ccfa0 100644
@@ -31,7 +31,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
 	const char *name;
 	u32 *clkfreq = NULL;
 	struct ufs_clk_info *clki;
-	int len = 0;
 	size_t sz = 0;
 
 	if (!np)
@@ -50,15 +49,12 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
 	if (cnt <= 0)
 		goto out;
 
-	if (!of_get_property(np, "freq-table-hz", &len)) {
+	sz = of_property_count_u32_elems(np, "freq-table-hz");
+	if (sz <= 0) {
 		dev_info(dev, "freq-table-hz property not specified\n");
 		goto out;
 	}
 
-	if (len <= 0)
-		goto out;
-
-	sz = len / sizeof(*clkfreq);
 	if (sz != 2 * cnt) {
 		dev_err(dev, "%s len mismatch\n", "freq-table-hz");
 		ret = -EINVAL;
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Rob Herring (Arm)

Replace of_get_property() with the type specific of_property_count_u32_elems() to get the property length.

This is part of a larger effort to remove callers of of_get_property() and similar functions. of_get_property() leaks the DT property data pointer which is a problem for dynamically allocated nodes which may be freed.

#2 lore raw
In reply to Rob Herring (Arm)

Rob,

Quoted 2 lines

Replace of_get_property() with the type specific of_property_count_u32_elems() to get the property length.

Applied to 6.12/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering