[PATCH master] mci: stm32_sdmmc2: fix warnings when building for 64-bit

[PATCH master] mci: stm32_sdmmc2: fix warnings when building for 64-bit

[Ahmad Fatoum]

Building the driver via CONFIG_COMPILE_TEST for 64-bit shows two
instances of type confusion, fix them.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/mci/stm32_sdmmc2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mci/stm32_sdmmc2.c b/drivers/mci/stm32_sdmmc2.c
index 84969a29d0f4..418213a1b334 100644
--- a/drivers/mci/stm32_sdmmc2.c
+++ b/drivers/mci/stm32_sdmmc2.c
@@ -257,8 +257,8 @@ static void stm32_sdmmc2_pwron(struct stm32_sdmmc2_priv *priv)
 	udelay(DIV_ROUND_UP(74 * USEC_PER_SEC, priv->mci.clock));
 }
 
-static int stm32_sdmmc2_start_data(struct stm32_sdmmc2_priv *priv,
-				    struct mci_data *data, u32 data_length)
+static dma_addr_t stm32_sdmmc2_start_data(struct stm32_sdmmc2_priv *priv,
+					  struct mci_data *data, u32 data_length)
 {
 	unsigned int num_bytes = data->blocks * data->blocksize;
 	dma_addr_t idmabase0;
@@ -494,8 +494,8 @@ static int stm32_sdmmc2_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
 
 	stm32_sdmmc2_start_cmd(priv, cmd, cmdat, data_length);
 
-	dev_dbg(priv->dev, "%s: send cmd %d data: 0x%x @ 0x%x\n", __func__,
-		cmd->cmdidx, data ? data_length : 0, (unsigned int)data);
+	dev_dbg(priv->dev, "%s: send cmd %d data: 0x%x @ %p\n", __func__,
+		cmd->cmdidx, data ? data_length : 0, data);
 
 	ret = stm32_sdmmc2_end_cmd(priv, cmd);
 
-- 
2.39.2

Re: [PATCH master] mci: stm32_sdmmc2: fix warnings when building for 64-bit

[Sascha Hauer]

On Thu, Dec 14, 2023 at 04:15:29PM +0100, Ahmad Fatoum wrote:
> Building the driver via CONFIG_COMPILE_TEST for 64-bit shows two
> instances of type confusion, fix them.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  drivers/mci/stm32_sdmmc2.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Squashed this into "mci: stm32_sdmmc2: correct usage of DMA API"
(currently sitting in next) which breaks it.

Sascha

> 
> diff --git a/drivers/mci/stm32_sdmmc2.c b/drivers/mci/stm32_sdmmc2.c
> index 84969a29d0f4..418213a1b334 100644
> --- a/drivers/mci/stm32_sdmmc2.c
> +++ b/drivers/mci/stm32_sdmmc2.c
> @@ -257,8 +257,8 @@ static void stm32_sdmmc2_pwron(struct stm32_sdmmc2_priv *priv)
>  	udelay(DIV_ROUND_UP(74 * USEC_PER_SEC, priv->mci.clock));
>  }
>  
> -static int stm32_sdmmc2_start_data(struct stm32_sdmmc2_priv *priv,
> -				    struct mci_data *data, u32 data_length)
> +static dma_addr_t stm32_sdmmc2_start_data(struct stm32_sdmmc2_priv *priv,
> +					  struct mci_data *data, u32 data_length)
>  {
>  	unsigned int num_bytes = data->blocks * data->blocksize;
>  	dma_addr_t idmabase0;
> @@ -494,8 +494,8 @@ static int stm32_sdmmc2_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
>  
>  	stm32_sdmmc2_start_cmd(priv, cmd, cmdat, data_length);
>  
> -	dev_dbg(priv->dev, "%s: send cmd %d data: 0x%x @ 0x%x\n", __func__,
> -		cmd->cmdidx, data ? data_length : 0, (unsigned int)data);
> +	dev_dbg(priv->dev, "%s: send cmd %d data: 0x%x @ %p\n", __func__,
> +		cmd->cmdidx, data ? data_length : 0, data);
>  
>  	ret = stm32_sdmmc2_end_cmd(priv, cmd);
>  
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |