ASoC: Convert a few more users to using %pOFn instead of device_node.name
Subsystems (10)
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.
--- 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
@@ -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
@@ -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
@@ -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
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.
--- drivers/input/serio/xilinx_ps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/serio/xilinx_ps2.c +1 -1
@@ -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
PATCH 1/1 power: reset: Convert to using %pOFn instead of device_node.name
In reply to Rob HerringIn preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.
--- drivers/power/reset/axxia-reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/reset/axxia-reset.c +1 -1
@@ -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
PATCH 1/1 uio: Convert a few more users to using %pOFn instead of device_node.name
In reply to Rob HerringIn preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.
--- 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
@@ -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
@@ -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
Re: [PATCH] input: xilinx_ps2: Convert to using %pOFn instead of device_node.name
In reply to Rob HerringQuoted 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.orgCc linux-arm-kernel at lists.infradead.orgSigned-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@@ -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