[U-Boot] [PATCH 1/2] mmc: sdhci: remove the unused argument for sdhci_setup_cfg

Minkyu Kang mk7.kang at samsung.com
Wed Jul 27 03:10:04 CEST 2016


Hi,

On 26/07/16 19:06, Jaehoon Chung wrote:
> buswidth isn't used anywhere in sdhci_setup_cfg.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung at samsung.com>
> ---
>  drivers/mmc/msm_sdhci.c  | 4 ++--
>  drivers/mmc/sdhci.c      | 4 ++--
>  drivers/mmc/zynq_sdhci.c | 2 +-
>  include/sdhci.h          | 3 +--
>  4 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
> index 70a8d96..e90a044 100644
> --- a/drivers/mmc/msm_sdhci.c
> +++ b/drivers/mmc/msm_sdhci.c
> @@ -144,8 +144,8 @@ static int msm_sdc_probe(struct udevice *dev)
>  	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
>  
>  	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
> -	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
> -			      caps, 0, 0, host->version, host->quirks, 0);
> +	ret = sdhci_setup_cfg(&plat->cfg, dev->name, caps,
> +			0, 0, host->version, host->quirks, 0);
>  	host->mmc = &plat->mmc;
>  	if (ret)
>  		return ret;
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index de8d8ea..d8cd75f 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -510,7 +510,7 @@ static const struct mmc_ops sdhci_ops = {
>  };
>  #endif
>  
> -int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
> +int sdhci_setup_cfg(struct mmc_config *cfg, const char *name,
>  		    uint caps, u32 max_clk, u32 min_clk, uint version,
>  		    uint quirks, uint host_caps)
>  {
> @@ -584,7 +584,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>  	}
>  #endif
>  
> -	if (sdhci_setup_cfg(&host->cfg, host->name, host->bus_width, caps,
> +	if (sdhci_setup_cfg(&host->cfg, host->name, caps,
>  			    max_clk, min_clk, SDHCI_GET_VERSION(host),
>  			    host->quirks, host->host_caps)) {
>  		printf("%s: Hardware doesn't specify base clock frequency\n",
> diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
> index bcd154a..69d6151 100644
> --- a/drivers/mmc/zynq_sdhci.c
> +++ b/drivers/mmc/zynq_sdhci.c
> @@ -40,7 +40,7 @@ static int arasan_sdhci_probe(struct udevice *dev)
>  	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
>  
>  	caps = sdhci_readl(host, SDHCI_CAPABILITIES);
> -	ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
> +	ret = sdhci_setup_cfg(&plat->cfg, dev->name,
>  			      caps, CONFIG_ZYNQ_SDHCI_MAX_FREQ,
>  			      CONFIG_ZYNQ_SDHCI_MIN_FREQ, host->version,
>  			      host->quirks, 0);
> diff --git a/include/sdhci.h b/include/sdhci.h
> index c4d3b55..693ecc1 100644
> --- a/include/sdhci.h
> +++ b/include/sdhci.h
> @@ -368,7 +368,6 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
>   *
>   * @cfg:	Configuration structure to fill in (generally &plat->mmc)
>   * @name:	Device name (normally dev->name)
> - * @buswidth:	Bus width (in bits, such as 4 or 8)
>   * @caps:	Host capabilities (MMC_MODE_...)
>   * @max_clk:	Maximum supported clock speed in HZ (0 for default)
>   * @min_clk:	Minimum supported clock speed in HZ (0 for default)
> @@ -377,7 +376,7 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
>   * @quirks:	Quick flags (SDHCI_QUIRK_...)
>   * @host_caps:	Additional host capabilities (0 if none)
>   */
> -int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
> +int sdhci_setup_cfg(struct mmc_config *cfg, const char *name,
>  		    uint caps, u32 max_clk, u32 min_clk, uint version,
>  		    uint quirks, uint host_caps);
>  
> 

looks good to me.

Reviewed-by: Minkyu Kang <mk7.kang at samsung.com>

but, this may make conflict with your patch (http://patchwork.ozlabs.org/patch/651179/)
What patch will apply first?
Please let me know.

Thanks,
Minkyu Kang.




More information about the U-Boot mailing list