Re: [PATCH] mmc: sdhci: replace mmc->parent with mmc_dev() for consistency
On Wed, 24 Mar 2021 at 08:50, Jisheng Zhang wrote:
>
> As pointed out by Ulf, "both "mmc->parent" and mmc_dev(mmc) are being
> used in the entire c-file". Convert all the mmc->parent usage in all
> sdhci host driver to mmc_dev() for consistency.
>
> Suggested-by: Ulf Hansson
> Signed-off-by: Jisheng Zhang
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-esdhc-mcf.c | 8 +++
> drivers/mmc/host/sdhci-of-aspeed.c | 2 +-
> drivers/mmc/host/sdhci-tegra.c | 34 +++---
> drivers/mmc/host/sdhci.c | 24 ++---
> drivers/mmc/host/sdhci_am654.c | 2 +-
> 5 files changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-esdhc-mcf.c
> b/drivers/mmc/host/sdhci-esdhc-mcf.c
> index ca7a1690b2a8..05926bf5ecf9 100644
> --- a/drivers/mmc/host/sdhci-esdhc-mcf.c
> +++ b/drivers/mmc/host/sdhci-esdhc-mcf.c
> @@ -367,14 +367,14 @@ static int esdhc_mcf_plat_init(struct sdhci_host *host,
>struct pltfm_mcf_data *mcf_data)
> {
> struct mcf_esdhc_platform_data *plat_data;
> + struct device *dev = mmc_dev(host->mmc);
>
> - if (!host->mmc->parent->platform_data) {
> - dev_err(mmc_dev(host->mmc), "no platform data!\n");
> + if (!dev->platform_data) {
> + dev_err(dev, "no platform data!\n");
> return -EINVAL;
> }
>
> - plat_data = (struct mcf_esdhc_platform_data *)
> - host->mmc->parent->platform_data;
> + plat_data = (struct mcf_esdhc_platform_data *)dev->platform_data;
>
> /* Card_detect */
> switch (plat_data->cd_type) {
> diff --git a/drivers/mmc/host/sdhci-of-aspeed.c
> b/drivers/mmc/host/sdhci-of-aspeed.c
> index 7d8692e90996..d001c51074a0 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> @@ -181,7 +181,7 @@ aspeed_sdhci_configure_phase(struct sdhci_host *host,
> unsigned long rate)
> struct aspeed_sdhci *sdhci;
> struct device *dev;
>
> - dev = host->mmc->parent;
> + dev = mmc_dev(host->mmc);
> sdhci = sdhci_pltfm_priv(sdhci_priv(host));
>
> if (!sdhci->phase_desc)
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 41d193fa77bb..c61f797a853f 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -596,49 +596,49 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct
> sdhci_host *host)
> _host->autocal_offsets;
> int err;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-up-offset-3v3",
> >pull_up_3v3);
> if (err)
> autocal->pull_up_3v3 = 0;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-down-offset-3v3",
> >pull_down_3v3);
> if (err)
> autocal->pull_down_3v3 = 0;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-up-offset-1v8",
> >pull_up_1v8);
> if (err)
> autocal->pull_up_1v8 = 0;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-down-offset-1v8",
> >pull_down_1v8);
> if (err)
> autocal->pull_down_1v8 = 0;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-up-offset-sdr104",
> >pull_up_sdr104);
> if (err)
> autocal->pull_up_sdr104 = autocal->pull_up_1v8;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-down-offset-sdr104",
> >pull_down_sdr104);
> if (err)
> autocal->pull_down_sdr104 = autocal->pull_down_1v8;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-up-offset-hs400",
> >pull_up_hs400);
> if (err)
> autocal->pull_up_hs400 = autocal->pull_up_1v8;
>
> - err = device_property_read_u32(host->mmc->parent,
> + err = device_property_read_u32(mmc_dev(host->mmc),
> "nvidia,pad-autocal-pull-down-offset-hs400",
>
[PATCH] mmc: sdhci: replace mmc->parent with mmc_dev() for consistency
As pointed out by Ulf, "both "mmc->parent" and mmc_dev(mmc) are being
used in the entire c-file". Convert all the mmc->parent usage in all
sdhci host driver to mmc_dev() for consistency.
Suggested-by: Ulf Hansson
Signed-off-by: Jisheng Zhang
---
drivers/mmc/host/sdhci-esdhc-mcf.c | 8 +++
drivers/mmc/host/sdhci-of-aspeed.c | 2 +-
drivers/mmc/host/sdhci-tegra.c | 34 +++---
drivers/mmc/host/sdhci.c | 24 ++---
drivers/mmc/host/sdhci_am654.c | 2 +-
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-mcf.c
b/drivers/mmc/host/sdhci-esdhc-mcf.c
index ca7a1690b2a8..05926bf5ecf9 100644
--- a/drivers/mmc/host/sdhci-esdhc-mcf.c
+++ b/drivers/mmc/host/sdhci-esdhc-mcf.c
@@ -367,14 +367,14 @@ static int esdhc_mcf_plat_init(struct sdhci_host *host,
struct pltfm_mcf_data *mcf_data)
{
struct mcf_esdhc_platform_data *plat_data;
+ struct device *dev = mmc_dev(host->mmc);
- if (!host->mmc->parent->platform_data) {
- dev_err(mmc_dev(host->mmc), "no platform data!\n");
+ if (!dev->platform_data) {
+ dev_err(dev, "no platform data!\n");
return -EINVAL;
}
- plat_data = (struct mcf_esdhc_platform_data *)
- host->mmc->parent->platform_data;
+ plat_data = (struct mcf_esdhc_platform_data *)dev->platform_data;
/* Card_detect */
switch (plat_data->cd_type) {
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c
b/drivers/mmc/host/sdhci-of-aspeed.c
index 7d8692e90996..d001c51074a0 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -181,7 +181,7 @@ aspeed_sdhci_configure_phase(struct sdhci_host *host,
unsigned long rate)
struct aspeed_sdhci *sdhci;
struct device *dev;
- dev = host->mmc->parent;
+ dev = mmc_dev(host->mmc);
sdhci = sdhci_pltfm_priv(sdhci_priv(host));
if (!sdhci->phase_desc)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 41d193fa77bb..c61f797a853f 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -596,49 +596,49 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct
sdhci_host *host)
_host->autocal_offsets;
int err;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-up-offset-3v3",
>pull_up_3v3);
if (err)
autocal->pull_up_3v3 = 0;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-down-offset-3v3",
>pull_down_3v3);
if (err)
autocal->pull_down_3v3 = 0;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-up-offset-1v8",
>pull_up_1v8);
if (err)
autocal->pull_up_1v8 = 0;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-down-offset-1v8",
>pull_down_1v8);
if (err)
autocal->pull_down_1v8 = 0;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-up-offset-sdr104",
>pull_up_sdr104);
if (err)
autocal->pull_up_sdr104 = autocal->pull_up_1v8;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-down-offset-sdr104",
>pull_down_sdr104);
if (err)
autocal->pull_down_sdr104 = autocal->pull_down_1v8;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-up-offset-hs400",
>pull_up_hs400);
if (err)
autocal->pull_up_hs400 = autocal->pull_up_1v8;
- err = device_property_read_u32(host->mmc->parent,
+ err = device_property_read_u32(mmc_dev(host->mmc),
"nvidia,pad-autocal-pull-down-offset-hs400",
>pull_down_hs400);
if (err)
@@ -653,7 +653,7 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct
sdhci_host *host)
if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
return;
- err = device_property_read_u32(host->mmc->parent,
+ err =
