ASoC: atmel: mchp-asrc: fix printk format specifier warnings

This patch fixes the following warnings discovered on 64 bit platforms:

sound/soc/atmel/mchp-asrc.c:1275:25: error: format '%x' expects
argument of type 'unsigned int', but argument 6 has type 'dma_addr_t'
{aka 'long long unsigned int'} [-Werror=format=]

sound/soc/atmel/mchp-asrc-dma.c:275:17: error: format '%x' expects
argument of type 'unsigned int', but argument 6 has type 'phys_addr_t'
{aka 'long long unsigned int'} [-Werror=format=]

sound/soc/atmel/mchp-asrc-dma.c:677:25: error: format '%u' expects
argument of type 'unsigned int', but argument 6 has type 'size_t'
{aka 'long unsigned int'} [-Werror=format=]

Fix specifiers using guidance in [1].

Link: https://www.kernel.org/doc/Documentation/printk-formats.txt [1]
Fixes: 0b902c5 ("ASoC: atmel: Add ASRC driver")
Signed-off-by: Cristian Birsan <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
Acked-by: Nicolas Ferre <[email protected]>
(cherry picked from linux-6.1-trunk/at91/sound)
Signed-off-by: Andrei Simion <[email protected]>

Author: cristibirsan

sound/soc/atmel/mchp-asrc-dma.c

@@ -258,7 +258,8 @@ static void mchp_asrc_start_handle(unsigned long data)
 		dma_async_issue_pending(dma_be_priv->desc->chan);
 }
 
-static int mchp_asrc_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
+static int mchp_asrc_dmaengine_pcm_prepare_slave_config(struct device *dev,
+							struct snd_pcm_substream *substream,
 							struct snd_pcm_hw_params *params,
 							struct snd_dmaengine_dai_dma_data *dma_data,
 							struct dma_slave_config *slave_config)
@@ -271,6 +272,15 @@ static int mchp_asrc_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream
 
 	snd_dmaengine_pcm_set_config_from_dai_data(substream, dma_data, slave_config);
 
+	dev_dbg(dev,
+		"%s() FE AIF dir %s, src addr %pap, dst addr: %pap, src_addr_width %d, dst_addr_width %d, src maxburst %u, dst maxburst %u\n",
+		__func__,
+		slave_config->direction == DMA_MEM_TO_DEV ? "DMA_MEM_TO_DEV" :
+							"DMA_DEV_TO_MEM",
+		&slave_config->src_addr, &slave_config->dst_addr,
+		slave_config->src_addr_width, slave_config->dst_addr_width,
+		slave_config->src_maxburst, slave_config->dst_maxburst);
+
 	return 0;
 }
 
@@ -346,11 +356,11 @@ mchp_asrc_be_dmaengine_slave_config(struct mchp_asrc_dmaengine_dai_dma *dma,
 	config_be.device_fc = false;
 
 	dev_dbg(dev,
-		"%s() AIF %s dir %s, src addr %#x, dst addr: %#x, src_addr_width %d, dst_addr_width %d, src maxburst %u, dst maxburst %u\n",
+		"%s() AIF %s dir %s, src addr %pap, dst addr: %pap, src_addr_width %d, dst_addr_width %d, src maxburst %u, dst maxburst %u\n",
 		__func__, dai->name,
 		config_be.direction == DMA_MEM_TO_DEV ? "DMA_MEM_TO_DEV" :
 							"DMA_DEV_TO_MEM",
-		config_be.src_addr, config_be.dst_addr,
+		&config_be.src_addr, &config_be.dst_addr,
 		config_be.src_addr_width, config_be.dst_addr_width,
 		config_be.src_maxburst, config_be.dst_maxburst);
 
@@ -477,19 +487,19 @@ static int mchp_asrc_dma_hw_params(struct snd_soc_component *component,
 		goto __cleanup_free_fe;
 	}
 
-	ret = mchp_asrc_dmaengine_pcm_prepare_slave_config(substream, params, dma_data_fe,
-							   &config_fe);
+	ret = mchp_asrc_dmaengine_pcm_prepare_slave_config(dev, substream, params,
+							   dma_data_fe, &config_fe);
 	if (ret) {
 		dev_err(dev, "failed to prepare DMA config for FE %s\n", cpu_dai->name);
 		goto __cleanup_dma_fe;
 	}
 
 	dev_dbg(dev,
-		"%s() config %s: dir %s, src addr %#x, dst addr %#x, src_addr_width %d, dst_addr_width %d, src maxburst %u, dst maxburst %u\n",
+		"%s() config %s: dir %s, src addr %pap, dst addr %pap, src_addr_width %d, dst_addr_width %d, src maxburst %u, dst maxburst %u\n",
 		__func__, cpu_dai->name,
 		config_fe.direction == DMA_MEM_TO_DEV ? "MEM_TO_DEV" :
 							"DEV_TO_MEM",
-		config_fe.src_addr, config_fe.dst_addr,
+		&config_fe.src_addr, &config_fe.dst_addr,
 		config_fe.src_addr_width, config_fe.dst_addr_width,
 		config_fe.src_maxburst, config_fe.dst_maxburst);
 
@@ -667,7 +677,7 @@ static int mchp_asrc_dma_prepare(struct snd_soc_component *component,
 		rtm_be = subs_be->runtime;
 
 		dev_dbg(dev,
-			"%s() BE buffer_size(periods) %ld, buffer_size(bytes) %u period_size(frames) %ld period_size(bytes) %u\n",
+			"%s() BE buffer_size(periods) %ld, buffer_size(bytes) %zu period_size(frames) %ld period_size(bytes) %zu\n",
 			__func__,
 			rtm_be->buffer_size, snd_pcm_lib_buffer_bytes(subs_be),
 			rtm_be->period_size, snd_pcm_lib_period_bytes(subs_be));
@@ -730,7 +740,7 @@ static int mchp_asrc_dma_prepare(struct snd_soc_component *component,
 		rtm_be = subs_be->runtime;
 
 		dev_dbg(dev,
-			"%s() BE buffer_size(periods) %ld, buffer_size(bytes) %u period_size(frames) %ld period_size(bytes) %u\n",
+			"%s() BE buffer_size(periods) %ld, buffer_size(bytes) %zu period_size(frames) %ld period_size(bytes) %zu\n",
 			__func__,
 			rtm_be->buffer_size, snd_pcm_lib_buffer_bytes(subs_be),
 			rtm_be->period_size, snd_pcm_lib_period_bytes(subs_be));
@@ -761,12 +771,16 @@ static int mchp_asrc_dma_prepare(struct snd_soc_component *component,
 			dev_err(dev, "failed to prepare client DMA for FE %s\n", cpu_dai->name);
 			return -ENOMEM;
 		}
-		dma_fe_priv->desc = desc;
 
-		dev_dbg(dev, "%s() FE buffer_size %ld, period_size %ld\n", __func__,
-			subs->runtime->buffer_size, subs->runtime->period_size);
+		dma_fe_priv->desc = desc;
 		dma_fe_priv->desc->callback = mchp_asrc_pcm_dma_complete;
 		dma_fe_priv->desc->callback_param = subs;
+
+		dev_dbg(dev,
+			"%s() FE buffer_size(periods) %ld, buffer_size(bytes) %zu period_size(frames) %ld period_size(bytes) %zu\n",
+			__func__,
+			subs->runtime->buffer_size, snd_pcm_lib_buffer_bytes(subs),
+			subs->runtime->period_size, snd_pcm_lib_period_bytes(subs));
 	} else {
 		dev_dbg(dev, "%s() FE DMA not found\n", __func__);
 	}

sound/soc/atmel/mchp-asrc.c

@@ -1275,9 +1275,9 @@ static int mchp_asrc_hw_params(struct snd_pcm_substream *substream,
 		list_add_tail(&dma_be->list, &dma->dma_in_list);
 
 		dev_dbg(priv->dev,
-			"%s() IN AIF %s: DMA addr %#x DMA chan %s DMA maxburst %d\n",
+			"%s() IN AIF %s: DMA addr %pad DMA chan %s DMA maxburst %d\n",
 			__func__, trig_be ? trig_be->phandle->np->full_name : dai->name,
-			dma_data_be->addr, dma_data_be->chan_name, dma_data_be->maxburst);
+			&dma_data_be->addr, dma_data_be->chan_name, dma_data_be->maxburst);
 	}
 
 	INIT_LIST_HEAD(&dma->dma_out_list);
@@ -1315,9 +1315,9 @@ static int mchp_asrc_hw_params(struct snd_pcm_substream *substream,
 		list_add_tail(&dma_be->list, &dma->dma_out_list);
 
 		dev_dbg(priv->dev,
-			"%s() OUT AIF %s: DMA addr %#x DMA chan %s DMA maxburst %d\n",
+			"%s() OUT AIF %s: DMA addr %pad DMA chan %s DMA maxburst %d\n",
 			__func__, trig_be ? trig_be->phandle->np->full_name : dai->name,
-			dma_data_be->addr, dma_data_be->chan_name, dma_data_be->maxburst);
+			&dma_data_be->addr, dma_data_be->chan_name, dma_data_be->maxburst);
 	}
 
 	/* get the number of free DSPs */