Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

mmc: fsl_esdhc: drop redundant code for non-removable feature

Browse source 
Drop redundant code for non-removable feature. "non-removable" property
has been read in mmc_of_parse().

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
This commit is contained in:
Yangbo Lu 2019-10-31 18:54:24 +08:00 committed by Peng Fan
parent 5705973b09
commit 08197cb8df
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmc/fsl_esdhc.c
View file

@ -75,7 +75,6 @@ struct fsl_esdhc_plat {
* @mmc: mmc * @mmc: mmc
* Following is used when Driver Model is enabled for MMC * Following is used when Driver Model is enabled for MMC
* @dev: pointer for the device * @dev: pointer for the device
* @non_removable: 0: removable; 1: non-removable
* @wp_enable: 1: enable checking wp; 0: no check * @wp_enable: 1: enable checking wp; 0: no check
* @cd_gpio: gpio for card detection * @cd_gpio: gpio for card detection
* @wp_gpio: gpio for write protection * @wp_gpio: gpio for write protection
@ -89,7 +88,6 @@ struct fsl_esdhc_priv {
struct mmc *mmc; struct mmc *mmc;
#endif #endif
struct udevice *dev; struct udevice *dev;
int non_removable;
int wp_enable; int wp_enable;
}; };
@ -628,12 +626,6 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
if (CONFIG_ESDHC_DETECT_QUIRK) if (CONFIG_ESDHC_DETECT_QUIRK)
return 1; return 1;
#endif #endif
#if CONFIG_IS_ENABLED(DM_MMC)
if (priv->non_removable)
return 1;
#endif
while (!(esdhc_read32(&regs->prsstat) & PRSSTAT_CINS) && --timeout) while (!(esdhc_read32(&regs->prsstat) & PRSSTAT_CINS) && --timeout)
udelay(1000); udelay(1000);
@ -870,12 +862,6 @@ static int fsl_esdhc_probe(struct udevice *dev)
#endif #endif
priv->dev = dev; priv->dev = dev;
if (dev_read_bool(dev, "non-removable")) {
priv->non_removable = 1;
} else {
priv->non_removable = 0;
}
priv->wp_enable = 1; priv->wp_enable = 1;
if (IS_ENABLED(CONFIG_CLK)) { if (IS_ENABLED(CONFIG_CLK)) {
@ -919,8 +905,12 @@ static int fsl_esdhc_probe(struct udevice *dev)
static int fsl_esdhc_get_cd(struct udevice *dev) static int fsl_esdhc_get_cd(struct udevice *dev)
{ {
struct fsl_esdhc_plat *plat = dev_get_platdata(dev);
struct fsl_esdhc_priv *priv = dev_get_priv(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); return esdhc_getcd_common(priv);
} }