Skip to contentSkip to conversation

mmc: Convert to using %pOF instead of full_name

PATCH Applied Rob Herring 5 participants 5 messages Jul 18, 2017 – Jul 27, 2017

Subsystems (4)
MMC, SD and SDIO Arm/Microchip (AT91) SoC support Microchip MMC/SD/SDIO mci driver Cavium MMC driver
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 mmc: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.

Signed-off-by Rob Herring <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Jan Glauber <[email protected]>
Cc David Daney <[email protected]>
Cc "Steven J. Hill" <[email protected]>
Cc [email protected]
---
 drivers/mmc/core/core.c      | 8 ++++----
 drivers/mmc/host/atmel-mci.c | 4 ++--
 drivers/mmc/host/cavium.c    | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/mmc/core/core.c +4 -4
index 26431267a3e2..6b4117615ad6 100644
@@ -1137,11 +1137,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
 	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
 	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
 	if (!voltage_ranges) {
-		pr_debug("%s: voltage-ranges unspecified\n", np->full_name);
+		pr_debug("%pOF: voltage-ranges unspecified\n", np);
 		return 0;
 	}
 	if (!num_ranges) {
-		pr_err("%s: voltage-ranges empty\n", np->full_name);
+		pr_err("%pOF: voltage-ranges empty\n", np);
 		return -EINVAL;
 	}
 

@@ -1153,8 +1153,8 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
 				be32_to_cpu(voltage_ranges[j]),
 				be32_to_cpu(voltage_ranges[j + 1]));
 		if (!ocr_mask) {
-			pr_err("%s: voltage-range #%d is invalid\n",
-				np->full_name, i);
+			pr_err("%pOF: voltage-range #%d is invalid\n",
+				np, i);
 			return -EINVAL;
 		}
 		*mask |= ocr_mask;
drivers/mmc/host/atmel-mci.c +2 -2
index 97de2d32ba84..b7c1cd384306 100644
@@ -665,8 +665,8 @@ atmci_of_init(struct platform_device *pdev)
 
 	for_each_child_of_node(np, cnp) {
 		if (of_property_read_u32(cnp, "reg", &slot_id)) {
-			dev_warn(&pdev->dev, "reg property is missing for %s\n",
-				 cnp->full_name);
+			dev_warn(&pdev->dev, "reg property is missing for %pOF\n",
+				 cnp);
 			continue;
 		}
drivers/mmc/host/cavium.c +2 -4
index 3686d77c717b..27fb625cbcf3 100644
@@ -957,14 +957,12 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot)
 
 	ret = of_property_read_u32(node, "reg", &id);
 	if (ret) {
-		dev_err(dev, "Missing or invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Missing or invalid reg property on %pOF\n", node);
 		return ret;
 	}
 
 	if (id >= CAVIUM_MAX_MMC || slot->host->slot[id]) {
-		dev_err(dev, "Invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Invalid reg property on %pOF\n", node);
 		return -EINVAL;
 	}

--
2.11.0

Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rob Herring

Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.

Signed-off-by Rob Herring <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Jan Glauber <[email protected]>
Cc David Daney <[email protected]>
Cc "Steven J. Hill" <[email protected]>
Cc [email protected]

For the Cavium bits, I haven't tested them, but they look fine, so ...

Acked-by David Daney <[email protected]>
Quoted 74 lines
---
  drivers/mmc/core/core.c      | 8 ++++----
  drivers/mmc/host/atmel-mci.c | 4 ++--
  drivers/mmc/host/cavium.c    | 6 ++----
  3 files changed, 8 insertions(+), 10 deletions(-)
drivers/mmc/core/core.c +4 -4
index 26431267a3e2..6b4117615ad6 100644
@@ -1137,11 +1137,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
  	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
  	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
  	if (!voltage_ranges) {
-		pr_debug("%s: voltage-ranges unspecified\n", np->full_name);
+		pr_debug("%pOF: voltage-ranges unspecified\n", np);
  		return 0;
  	}
  	if (!num_ranges) {
-		pr_err("%s: voltage-ranges empty\n", np->full_name);
+		pr_err("%pOF: voltage-ranges empty\n", np);
  		return -EINVAL;
  	}
 

@@ -1153,8 +1153,8 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
  				be32_to_cpu(voltage_ranges[j]),
  				be32_to_cpu(voltage_ranges[j + 1]));
  		if (!ocr_mask) {
-			pr_err("%s: voltage-range #%d is invalid\n",
-				np->full_name, i);
+			pr_err("%pOF: voltage-range #%d is invalid\n",
+				np, i);
  			return -EINVAL;
  		}
  		*mask |= ocr_mask;
drivers/mmc/host/atmel-mci.c +2 -2
index 97de2d32ba84..b7c1cd384306 100644
@@ -665,8 +665,8 @@ atmci_of_init(struct platform_device *pdev)
 
  	for_each_child_of_node(np, cnp) {
  		if (of_property_read_u32(cnp, "reg", &slot_id)) {
-			dev_warn(&pdev->dev, "reg property is missing for %s\n",
-				 cnp->full_name);
+			dev_warn(&pdev->dev, "reg property is missing for %pOF\n",
+				 cnp);
  			continue;
  		}
drivers/mmc/host/cavium.c +2 -5
index 3686d77c717b..27fb625cbcf3 100644
@@ -957,14 +957,12 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot)
 
  	ret = of_property_read_u32(node, "reg", &id);
  	if (ret) {
-		dev_err(dev, "Missing or invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Missing or invalid reg property on %pOF\n", node);
  		return ret;
  	}
 
  	if (id >= CAVIUM_MAX_MMC || slot->host->slot[id]) {
-		dev_err(dev, "Invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Invalid reg property on %pOF\n", node);
  		return -EINVAL;
  	}
 
--

2.11.0

Tested-by
#2 lore raw
Quoted 13 lines · David Daney
Quoted 11 lines · Rob Herring

Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.

Signed-off-by Rob Herring <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Jan Glauber <jglauber-YGCgFSpz5w/[email protected]>
Cc David Daney <david.daney-YGCgFSpz5w/[email protected]>
Cc "Steven J. Hill" <Steven.Hill-YGCgFSpz5w/[email protected]>
Cc [email protected]
Quoted 4 lines

For the Cavium bits, I haven't tested them, but they look fine, so ...

Acked-by David Daney <david.daney-YGCgFSpz5w/[email protected]>

Tested and work on our platforms....

Tested-by Steven J. Hill <Steven.Hill-YGCgFSpz5w/[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Acked-by on v1 1/1
#3 lore raw
In reply to Rob Herring
Quoted 11 lines · Rob Herring

Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.

Signed-off-by Rob Herring <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Jan Glauber <jglauber-YGCgFSpz5w/[email protected]>
Cc David Daney <david.daney-YGCgFSpz5w/[email protected]>
Cc "Steven J. Hill" <Steven.Hill-YGCgFSpz5w/[email protected]>
Cc [email protected]
Quoted 3 lines
---
 drivers/mmc/core/core.c      | 8 ++++----
 drivers/mmc/host/atmel-mci.c | 4 ++--
Acked-by Ludovic Desroches <[email protected]>
Quoted 69 lines
 drivers/mmc/host/cavium.c    | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/mmc/core/core.c +4 -4
index 26431267a3e2..6b4117615ad6 100644
@@ -1137,11 +1137,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
 	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
 	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
 	if (!voltage_ranges) {
-		pr_debug("%s: voltage-ranges unspecified\n", np->full_name);
+		pr_debug("%pOF: voltage-ranges unspecified\n", np);
 		return 0;
 	}
 	if (!num_ranges) {
-		pr_err("%s: voltage-ranges empty\n", np->full_name);
+		pr_err("%pOF: voltage-ranges empty\n", np);
 		return -EINVAL;
 	}
 

@@ -1153,8 +1153,8 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
 				be32_to_cpu(voltage_ranges[j]),
 				be32_to_cpu(voltage_ranges[j + 1]));
 		if (!ocr_mask) {
-			pr_err("%s: voltage-range #%d is invalid\n",
-				np->full_name, i);
+			pr_err("%pOF: voltage-range #%d is invalid\n",
+				np, i);
 			return -EINVAL;
 		}
 		*mask |= ocr_mask;
drivers/mmc/host/atmel-mci.c +2 -2
index 97de2d32ba84..b7c1cd384306 100644
@@ -665,8 +665,8 @@ atmci_of_init(struct platform_device *pdev)
 
 	for_each_child_of_node(np, cnp) {
 		if (of_property_read_u32(cnp, "reg", &slot_id)) {
-			dev_warn(&pdev->dev, "reg property is missing for %s\n",
-				 cnp->full_name);
+			dev_warn(&pdev->dev, "reg property is missing for %pOF\n",
+				 cnp);
 			continue;
 		}
drivers/mmc/host/cavium.c +2 -5
index 3686d77c717b..27fb625cbcf3 100644
@@ -957,14 +957,12 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot)
 
 	ret = of_property_read_u32(node, "reg", &id);
 	if (ret) {
-		dev_err(dev, "Missing or invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Missing or invalid reg property on %pOF\n", node);
 		return ret;
 	}
 
 	if (id >= CAVIUM_MAX_MMC || slot->host->slot[id]) {
-		dev_err(dev, "Invalid reg property on %s\n",
-			of_node_full_name(node));
+		dev_err(dev, "Invalid reg property on %pOF\n", node);
 		return -EINVAL;
 	}
 
--
Quoted 2 lines

2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#4 lore raw
In reply to Rob Herring
Quoted 11 lines · Rob Herring

Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node.

Signed-off-by Rob Herring <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Jan Glauber <[email protected]>
Cc David Daney <[email protected]>
Cc "Steven J. Hill" <[email protected]>
Cc [email protected]

Thanks, applied for next!

Kind regards
Uffe

Quoted 74 lines
---
 drivers/mmc/core/core.c      | 8 ++++----
 drivers/mmc/host/atmel-mci.c | 4 ++--
 drivers/mmc/host/cavium.c    | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/mmc/core/core.c +4 -4
index 26431267a3e2..6b4117615ad6 100644
@@ -1137,11 +1137,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
        voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
        num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
        if (!voltage_ranges) {
-               pr_debug("%s: voltage-ranges unspecified\n", np->full_name);
+               pr_debug("%pOF: voltage-ranges unspecified\n", np);
                return 0;
        }
        if (!num_ranges) {
-               pr_err("%s: voltage-ranges empty\n", np->full_name);
+               pr_err("%pOF: voltage-ranges empty\n", np);
                return -EINVAL;
        }
 

@@ -1153,8 +1153,8 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
                                be32_to_cpu(voltage_ranges[j]),
                                be32_to_cpu(voltage_ranges[j + 1]));
                if (!ocr_mask) {
-                       pr_err("%s: voltage-range #%d is invalid\n",
-                               np->full_name, i);
+                       pr_err("%pOF: voltage-range #%d is invalid\n",
+                               np, i);
                        return -EINVAL;
                }
                *mask |= ocr_mask;
drivers/mmc/host/atmel-mci.c +2 -2
index 97de2d32ba84..b7c1cd384306 100644
@@ -665,8 +665,8 @@ atmci_of_init(struct platform_device *pdev)
 
        for_each_child_of_node(np, cnp) {
                if (of_property_read_u32(cnp, "reg", &slot_id)) {
-                       dev_warn(&pdev->dev, "reg property is missing for %s\n",
-                                cnp->full_name);
+                       dev_warn(&pdev->dev, "reg property is missing for %pOF\n",
+                                cnp);
                        continue;
                }
drivers/mmc/host/cavium.c +2 -5
index 3686d77c717b..27fb625cbcf3 100644
@@ -957,14 +957,12 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot)
 
        ret = of_property_read_u32(node, "reg", &id);
        if (ret) {
-               dev_err(dev, "Missing or invalid reg property on %s\n",
-                       of_node_full_name(node));
+               dev_err(dev, "Missing or invalid reg property on %pOF\n", node);
                return ret;
        }
 
        if (id >= CAVIUM_MAX_MMC || slot->host->slot[id]) {
-               dev_err(dev, "Invalid reg property on %s\n",
-                       of_node_full_name(node));
+               dev_err(dev, "Invalid reg property on %pOF\n", node);
                return -EINVAL;
        }
 
--

2.11.0