[PATCH 1/8] mmc: sunxi: Avoid #ifdefs in delay and width setup

[Jaehoon Chung]

On 5/25/21 8:30 AM, Andre Przywara wrote:
> The delay and bus-width setup are slightly different across the
> Allwinner SoC generations, and we covered this so far with some
> preprocessor conditionals.
> 
> Use the more readable IS_ENABLE() instead.
> 
> Signed-off-by: Andre Przywara <andre.przywara at arm.com>

Reviewed-by: Jaehoon Chung <jh80.chung at samsung.com>

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/sunxi_mmc.c | 33 +++++++++++++++------------------
>  1 file changed, 15 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index 3503ccdb2ee..87b79fcf5ef 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -156,23 +156,19 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
>  	} else if (hz <= 25000000) {
>  		oclk_dly = 0;
>  		sclk_dly = 5;
> -#ifdef CONFIG_MACH_SUN9I
> -	} else if (hz <= 52000000) {
> -		oclk_dly = 5;
> -		sclk_dly = 4;
> -	} else {
> -		/* hz > 52000000 */
> -		oclk_dly = 2;
> -		sclk_dly = 4;
> -#else
> -	} else if (hz <= 52000000) {
> -		oclk_dly = 3;
> -		sclk_dly = 4;
>  	} else {
> -		/* hz > 52000000 */
> -		oclk_dly = 1;
> +		if (IS_ENABLED(CONFIG_MACH_SUN9I)) {
> +			if (hz <= 52000000)
> +				oclk_dly = 5;
> +			else
> +				oclk_dly = 2;
> +		} else {
> +			if (hz <= 52000000)
> +				oclk_dly = 3;
> +			else
> +				oclk_dly = 1;
> +		}
>  		sclk_dly = 4;
> -#endif
>  	}
>  
>  	if (new_mode) {
> @@ -521,10 +517,11 @@ struct mmc *sunxi_mmc_init(int sdc_no)
>  
>  	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
>  	cfg->host_caps = MMC_MODE_4BIT;
> -#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN8I) || defined(CONFIG_SUN50I_GEN_H6)
> -	if (sdc_no == 2)
> +
> +	if ((IS_ENABLED(CONFIG_MACH_SUN50I) || IS_ENABLED(CONFIG_MACH_SUN8I) ||
> +	    IS_ENABLED(CONFIG_SUN50I_GEN_H6)) && (sdc_no == 2))
>  		cfg->host_caps = MMC_MODE_8BIT;
> -#endif
> +
>  	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
>  	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
>  
>