[PATCH v2 05/11] mmc: fsl_esdhc_imx: drop redundant code for non-removable feature

[Jaehoon Chung]

On 11/13/21 4:15 AM, Sean Anderson wrote:
> [ fsl_esdhc commit commit 08197cb8dff7cd097ab07a325093043c39d19bbd ]
> 
> Drop redundant code for non-removable feature. "non-removable" property
> has been read in mmc_of_parse().
> 
> Signed-off-by: Yangbo Lu <yangbo.lu at nxp.com>
> Signed-off-by: Sean Anderson <sean.anderson at seco.com>

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

Best Regards,
Jaehoon Chung

> ---
> 
> (no changes since v1)
> 
>  drivers/mmc/fsl_esdhc_imx.c | 28 ++++++++++------------------
>  1 file changed, 10 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
> index b604729750..b2844d0a7b 100644
> --- a/drivers/mmc/fsl_esdhc_imx.c
> +++ b/drivers/mmc/fsl_esdhc_imx.c
> @@ -130,7 +130,6 @@ struct esdhc_soc_data {
>   * @mmc: mmc
>   * Following is used when Driver Model is enabled for MMC
>   * @dev: pointer for the device
> - * @non_removable: 0: removable; 1: non-removable
>   * @broken_cd: 0: use GPIO for card detect; 1: Do not use GPIO for card detect
>   * @wp_enable: 1: enable checking wp; 0: no check
>   * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
> @@ -154,7 +153,6 @@ struct fsl_esdhc_priv {
>  	struct mmc *mmc;
>  #endif
>  	struct udevice *dev;
> -	int non_removable;
>  	int broken_cd;
>  	int wp_enable;
>  	int vs18_enable;
> @@ -1083,9 +1081,6 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
>  #endif
>  
>  #if CONFIG_IS_ENABLED(DM_MMC)
> -	if (priv->non_removable)
> -		return 1;
> -
>  	if (priv->broken_cd)
>  		return 1;
>  #if CONFIG_IS_ENABLED(DM_GPIO)
> @@ -1415,25 +1410,18 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev)
>  	if (dev_read_bool(dev, "broken-cd"))
>  		priv->broken_cd = 1;
>  
> -	if (dev_read_bool(dev, "non-removable")) {
> -		priv->non_removable = 1;
> -	 } else {
> -		priv->non_removable = 0;
> -#if CONFIG_IS_ENABLED(DM_GPIO)
> -		gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio,
> -				     GPIOD_IS_IN);
> -#endif
> -	}
> -
>  	if (dev_read_prop(dev, "fsl,wp-controller", NULL)) {
>  		priv->wp_enable = 1;
>  	} else {
>  		priv->wp_enable = 0;
> +	}
> +
>  #if CONFIG_IS_ENABLED(DM_GPIO)
> -		gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio,
> -				   GPIOD_IS_IN);
> +	gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio,
> +			     GPIOD_IS_IN);
> +	gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio,
> +			     GPIOD_IS_IN);
>  #endif
> -	}
>  
>  	priv->vs18_enable = 0;
>  
> @@ -1567,8 +1555,12 @@ static int fsl_esdhc_probe(struct udevice *dev)
>  
>  static int fsl_esdhc_get_cd(struct udevice *dev)
>  {
> +	struct fsl_esdhc_plat *plat = dev_get_plat(dev);
>  	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
>  
> +	if (plat->cfg.host_caps & MMC_CAP_NONREMOVABLE)
> +		return 1;
> +
>  	return esdhc_getcd_common(priv);
>  }
>  
>