[PATCH] fixup! mci: move mci_setup_cmd definition into header

[PATCH] fixup! mci: move mci_setup_cmd definition into header

[Ahmad Fatoum]

mci: dwcmshc-sdhci: fix redefinition of mci_setup_cmd

No defconfigs currently enable the driver, so it went unnoticed that it
already defines mci_setup_cmd and that this would clash with defining it
in a header.

The allyesconfig CI test noticed that though, so drop the now duplicate
definition.

We likely will want to enable this driver in the kvx defconfig though
going forward.

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

diff --git a/drivers/mci/dwcmshc-sdhci.c b/drivers/mci/dwcmshc-sdhci.c
index a7306fdb44a4..8398889a703c 100644
--- a/drivers/mci/dwcmshc-sdhci.c
+++ b/drivers/mci/dwcmshc-sdhci.c
@@ -40,14 +40,6 @@ static inline struct dwcmshc_host *priv_from_mci_host(struct mci_host *h)
 	return container_of(h, struct dwcmshc_host, mci);
 }
 
-static void mci_setup_cmd(struct mci_cmd *p, unsigned int cmd, unsigned int arg,
-			  unsigned int response)
-{
-	p->cmdidx = cmd;
-	p->cmdarg = arg;
-	p->resp_type = response;
-}
-
 static int do_abort_sequence(struct mci_host *mci, struct mci_cmd *current_cmd)
 {
 	int ret = 0;
-- 
2.39.5

Re: [PATCH] fixup! mci: move mci_setup_cmd definition into header

[Sascha Hauer]

On Wed, Apr 23, 2025 at 10:38:01AM +0200, Ahmad Fatoum wrote:
> mci: dwcmshc-sdhci: fix redefinition of mci_setup_cmd
> 
> No defconfigs currently enable the driver, so it went unnoticed that it
> already defines mci_setup_cmd and that this would clash with defining it
> in a header.
> 
> The allyesconfig CI test noticed that though, so drop the now duplicate
> definition.
> 
> We likely will want to enable this driver in the kvx defconfig though
> going forward.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  drivers/mci/dwcmshc-sdhci.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/mci/dwcmshc-sdhci.c b/drivers/mci/dwcmshc-sdhci.c
> index a7306fdb44a4..8398889a703c 100644
> --- a/drivers/mci/dwcmshc-sdhci.c
> +++ b/drivers/mci/dwcmshc-sdhci.c
> @@ -40,14 +40,6 @@ static inline struct dwcmshc_host *priv_from_mci_host(struct mci_host *h)
>  	return container_of(h, struct dwcmshc_host, mci);
>  }
>  
> -static void mci_setup_cmd(struct mci_cmd *p, unsigned int cmd, unsigned int arg,
> -			  unsigned int response)
> -{
> -	p->cmdidx = cmd;
> -	p->cmdarg = arg;
> -	p->resp_type = response;
> -}
> -

I already fixed this one, thanks

Sascha

-- 
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 |