[alsa-devel] [PATCH v2] sound: Convert to using %pOF instead of full_name

Takashi Iwai tiwai at suse.de
Fri Jul 21 22:23:10 CEST 2017


On Fri, 21 Jul 2017 21:28:34 +0200,
Rob Herring wrote:
> 
> 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 <robh at kernel.org>
> Cc: Johannes Berg <johannes at sipsolutions.net>
> Cc: Jaroslav Kysela <perex at perex.cz>
> Cc: Takashi Iwai <tiwai at suse.com>
> Cc: Timur Tabi <timur at tabi.org>
> Cc: Nicolin Chen <nicoleotsuka at gmail.com>
> Cc: Xiubo Li <Xiubo.Lee at gmail.com>
> Cc: Fabio Estevam <fabio.estevam at nxp.com>
> Cc: Liam Girdwood <lgirdwood at gmail.com>
> Cc: Mark Brown <broonie at kernel.org>
> Cc: linuxppc-dev at lists.ozlabs.org
> Cc: alsa-devel at alsa-project.org
> ---
> v2:
> - Add printf specifier change for fsl_dma.c

Could you split this one to the one for sound/aoa/* and one for
sound/soc/fsl?  It makes much easier to apply the patch, as the former
goes directly to me while the latter through Mark's ASoC tree.


thanks,

Takashi


> 
>  sound/aoa/codecs/tas.c     |  4 ++--
>  sound/soc/fsl/fsl_dma.c    |  4 ++--
>  sound/soc/fsl/imx-audmux.c | 16 ++++++++--------
>  3 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c
> index 733b6365dad6..15c05755d270 100644
> --- a/sound/aoa/codecs/tas.c
> +++ b/sound/aoa/codecs/tas.c
> @@ -905,8 +905,8 @@ static int tas_i2c_probe(struct i2c_client *client,
>  		goto fail;
>  	}
>  	printk(KERN_DEBUG
> -	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",
> -	       (unsigned int)client->addr, node->full_name);
> +	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n",
> +	       (unsigned int)client->addr, node);
>  	return 0;
>   fail:
>  	mutex_destroy(&tas->mtx);
> diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
> index ccadefceeff2..ed8ea002902d 100644
> --- a/sound/soc/fsl/fsl_dma.c
> +++ b/sound/soc/fsl/fsl_dma.c
> @@ -897,8 +897,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
>  
>  	ret = of_address_to_resource(ssi_np, 0, &res);
>  	if (ret) {
> -		dev_err(&pdev->dev, "could not determine resources for %s\n",
> -			ssi_np->full_name);
> +		dev_err(&pdev->dev, "could not determine resources for %pOF\n",
> +			ssi_np);
>  		of_node_put(ssi_np);
>  		return ret;
>  	}
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index fc57da341d61..392d5eef356d 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -268,13 +268,13 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
>  
>  		ret = of_property_read_u32(child, "fsl,audmux-port", &port);
>  		if (ret) {
> -			dev_warn(&pdev->dev, "Failed to get fsl,audmux-port of child node \"%s\"\n",
> -					child->full_name);
> +			dev_warn(&pdev->dev, "Failed to get fsl,audmux-port of child node \"%pOF\"\n",
> +					child);
>  			continue;
>  		}
>  		if (!of_property_read_bool(child, "fsl,port-config")) {
> -			dev_warn(&pdev->dev, "child node \"%s\" does not have property fsl,port-config\n",
> -					child->full_name);
> +			dev_warn(&pdev->dev, "child node \"%pOF\" does not have property fsl,port-config\n",
> +					child);
>  			continue;
>  		}
>  
> @@ -292,15 +292,15 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
>  		}
>  
>  		if (ret != -EOVERFLOW) {
> -			dev_err(&pdev->dev, "Failed to read u32 at index %d of child %s\n",
> -					i, child->full_name);
> +			dev_err(&pdev->dev, "Failed to read u32 at index %d of child %pOF\n",
> +					i, child);
>  			continue;
>  		}
>  
>  		if (audmux_type == IMX31_AUDMUX) {
>  			if (i % 2) {
> -				dev_err(&pdev->dev, "One pdcr value is missing in child node %s\n",
> -						child->full_name);
> +				dev_err(&pdev->dev, "One pdcr value is missing in child node %pOF\n",
> +						child);
>  				continue;
>  			}
>  			imx_audmux_v2_configure_port(port, ptcr, pdcr);
> -- 
> 2.11.0
> 
> 


More information about the Alsa-devel mailing list