Skip to contentSkip to conversation

ASoC: Convert a few more users to using %pOFn instead of device_node.name

PATCH New Rob Herring 2 participants 5 messages Oct 1, 2018

Subsystems (10)
Sound ASoC HID Arm MediaTek +6 more subsystems
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 ASoC: Convert a few more users to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Maxime Coquelin <[email protected]>
Cc Alexandre Torgue <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
---
 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +-
 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +-
 sound/soc/stm/stm32_sai.c                  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt6797/mt6797-afe-pcm.c +1 -1
index 192f4d7b37b6..bff7d71d0742 100644
@@ -828,7 +828,7 @@ static int mt6797_afe_pcm_dev_probe(struct platform_device *pdev)
 	/* request irq */
 	irq_id = platform_get_irq(pdev, 0);
 	if (!irq_id) {
-		dev_err(dev, "%s no irq found\n", dev->of_node->name);
+		dev_err(dev, "%pOFn no irq found\n", dev->of_node);
 		return -ENXIO;
 	}
 	ret = devm_request_irq(dev, irq_id, mt6797_afe_irq_handler,
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +1 -1
index c0b6697503fd..166aed28330d 100644
@@ -1092,7 +1092,7 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 
 	irq_id = platform_get_irq(pdev, 0);
 	if (irq_id <= 0) {
-		dev_err(afe->dev, "np %s no irq\n", afe->dev->of_node->name);
+		dev_err(afe->dev, "np %pOFn no irq\n", afe->dev->of_node);
 		return irq_id < 0 ? irq_id : -ENXIO;
 	}
 	ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
sound/soc/stm/stm32_sai.c +4 -4
index d597eba61992..bcb35cae2a2c 100644
@@ -74,14 +74,14 @@ static int stm32_sai_sync_conf_provider(struct stm32_sai_data *sai, int synco)
 		return ret;
 	}
 
-	dev_dbg(&sai->pdev->dev, "Set %s%s as synchro provider\n",
-		sai->pdev->dev.of_node->name,
+	dev_dbg(&sai->pdev->dev, "Set %pOFn%s as synchro provider\n",
+		sai->pdev->dev.of_node,
 		synco == STM_SAI_SYNC_OUT_A ? "A" : "B");
 
 	prev_synco = FIELD_GET(SAI_GCR_SYNCOUT_MASK, readl_relaxed(sai->base));
 	if (prev_synco != STM_SAI_SYNC_OUT_NONE && synco != prev_synco) {
-		dev_err(&sai->pdev->dev, "%s%s already set as sync provider\n",
-			sai->pdev->dev.of_node->name,
+		dev_err(&sai->pdev->dev, "%pOFn%s already set as sync provider\n",
+			sai->pdev->dev.of_node,
 			prev_synco == STM_SAI_SYNC_OUT_A ? "A" : "B");
 		clk_disable_unprepare(sai->pclk);
 		return -EINVAL;
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/1 input: xilinx_ps2: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Dmitry Torokhov <[email protected]>
Cc Michal Simek <[email protected]>
Cc linux-input at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Rob Herring <[email protected]>
---
 drivers/input/serio/xilinx_ps2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/serio/xilinx_ps2.c +1 -1
index 07de1b49293c..6615c02a08fd 100644
@@ -245,7 +245,7 @@ static int xps2_of_probe(struct platform_device *ofdev)
 	unsigned int irq;
 	int error;
 
-	dev_info(dev, "Device Tree Probing \'%s\'\n", dev->of_node->name);
+	dev_info(dev, "Device Tree Probing \'%pOFn\'\n", dev->of_node);
 
 	/* Get iospace for the device */
 	error = of_address_to_resource(dev->of_node, 0, &r_mem);
Signature · 1 line
2.17.1
maintainer Applied
#2 lore raw

Re: [PATCH] input: xilinx_ps2: Convert to using %pOFn instead of device_node.name

Quoted 8 lines · Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Dmitry Torokhov <[email protected]>
Cc Michal Simek <[email protected]>
Cc linux-input at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Rob Herring <[email protected]>

Applied, thank you.

Quoted 20 lines
---
 drivers/input/serio/xilinx_ps2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/serio/xilinx_ps2.c +1 -1
index 07de1b49293c..6615c02a08fd 100644
@@ -245,7 +245,7 @@ static int xps2_of_probe(struct platform_device *ofdev)
 	unsigned int irq;
 	int error;
 
-	dev_info(dev, "Device Tree Probing \'%s\'\n", dev->of_node->name);
+	dev_info(dev, "Device Tree Probing \'%pOFn\'\n", dev->of_node);
 
 	/* Get iospace for the device */
 	error = of_address_to_resource(dev->of_node, 0, &r_mem);
Signature · 1 line
2.17.1
Signature · 1 line
Dmitry
author
#3 lore raw

PATCH 1/1 power: reset: Convert to using %pOFn instead of device_node.name

In reply to Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Sebastian Reichel <[email protected]>
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
---
 drivers/power/reset/axxia-reset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/reset/axxia-reset.c +1 -1
index 4e4cd1c8fe50..b16013265142 100644
@@ -65,7 +65,7 @@ static int axxia_reset_probe(struct platform_device *pdev)
 
 	syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");
 	if (IS_ERR(syscon)) {
-		pr_err("%s: syscon lookup failed\n", dev->of_node->name);
+		pr_err("%pOFn: syscon lookup failed\n", dev->of_node);
 		return PTR_ERR(syscon);
 	}
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 1/1 uio: Convert a few more users to using %pOFn instead of device_node.name

In reply to Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Greg Kroah-Hartman <[email protected]>
Signed-off-by Rob Herring <[email protected]>
---
 drivers/uio/uio_dmem_genirq.c | 3 ++-
 drivers/uio/uio_pdrv_genirq.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/uio/uio_dmem_genirq.c +2 -1
index e1134a4d97f3..003badaef5f3 100644
@@ -163,7 +163,8 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "unable to kmalloc\n");
 			goto bad2;
 		}
-		uioinfo->name = pdev->dev.of_node->name;
+		uioinfo->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOFn",
+					       pdev->dev.of_node);
 		uioinfo->version = "devicetree";
 
 		/* Multiple IRQs are not supported */
drivers/uio/uio_pdrv_genirq.c +2 -1
index f598ecddc8a7..6c759934bff3 100644
@@ -118,7 +118,8 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "unable to kmalloc\n");
 			return -ENOMEM;
 		}
-		uioinfo->name = pdev->dev.of_node->name;
+		uioinfo->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOFn",
+					       pdev->dev.of_node);
 		uioinfo->version = "devicetree";
 		/* Multiple IRQs are not supported */
 	}
Signature · 1 line
2.17.1