| Message ID | 1485247827-12898-2-git-send-email-riteshh@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On 24/01/17 10:50, Ritesh Harjani wrote: > platform_execute_tuning should not really exist as it does not > do anything useful. > > So remove this ops and directly plug sdhci_msm_execute_tuning > with mmc_host_ops. > > Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once > HS400 related mode selection is done. > > Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-msm.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index f958697..b3e8f44 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host) > return ret; > } > > -static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) > +static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode) > { > + struct sdhci_host *host = mmc_priv(mmc); > int tuning_seq_cnt = 3; > u8 phase, tuned_phases[16], tuned_phase_cnt = 0; > int rc; > - struct mmc_host *mmc = host->mmc; > struct mmc_ios ios = host->mmc->ios; > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > @@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) > if (host->flags & SDHCI_HS400_TUNING) { > sdhci_msm_hc_select_mode(host); > msm_set_clock_rate_for_bus_mode(host, ios.clock); > + host->flags &= ~SDHCI_HS400_TUNING; > } > > retry: > @@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) > MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); > > static const struct sdhci_ops sdhci_msm_ops = { > - .platform_execute_tuning = sdhci_msm_execute_tuning, > .reset = sdhci_reset, > .set_clock = sdhci_msm_set_clock, > .get_min_clock = sdhci_msm_get_min_clock, > @@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) > MSM_MMC_AUTOSUSPEND_DELAY_MS); > pm_runtime_use_autosuspend(&pdev->dev); > > + host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning; > ret = sdhci_add_host(host); > if (ret) > goto pm_runtime_disable; > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 24 January 2017 at 09:50, Ritesh Harjani <riteshh@codeaurora.org> wrote: > platform_execute_tuning should not really exist as it does not > do anything useful. > > So remove this ops and directly plug sdhci_msm_execute_tuning > with mmc_host_ops. > > Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once > HS400 related mode selection is done. > > Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci-msm.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index f958697..b3e8f44 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host) > return ret; > } > > -static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) > +static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode) > { > + struct sdhci_host *host = mmc_priv(mmc); > int tuning_seq_cnt = 3; > u8 phase, tuned_phases[16], tuned_phase_cnt = 0; > int rc; > - struct mmc_host *mmc = host->mmc; > struct mmc_ios ios = host->mmc->ios; > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > @@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) > if (host->flags & SDHCI_HS400_TUNING) { > sdhci_msm_hc_select_mode(host); > msm_set_clock_rate_for_bus_mode(host, ios.clock); > + host->flags &= ~SDHCI_HS400_TUNING; > } > > retry: > @@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) > MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); > > static const struct sdhci_ops sdhci_msm_ops = { > - .platform_execute_tuning = sdhci_msm_execute_tuning, > .reset = sdhci_reset, > .set_clock = sdhci_msm_set_clock, > .get_min_clock = sdhci_msm_get_min_clock, > @@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) > MSM_MMC_AUTOSUSPEND_DELAY_MS); > pm_runtime_use_autosuspend(&pdev->dev); > > + host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning; > ret = sdhci_add_host(host); > if (ret) > goto pm_runtime_disable; > -- > The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, > a Linux Foundation Collaborative Project. > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index f958697..b3e8f44 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host) return ret; } -static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) +static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode) { + struct sdhci_host *host = mmc_priv(mmc); int tuning_seq_cnt = 3; u8 phase, tuned_phases[16], tuned_phase_cnt = 0; int rc; - struct mmc_host *mmc = host->mmc; struct mmc_ios ios = host->mmc->ios; struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); @@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) if (host->flags & SDHCI_HS400_TUNING) { sdhci_msm_hc_select_mode(host); msm_set_clock_rate_for_bus_mode(host, ios.clock); + host->flags &= ~SDHCI_HS400_TUNING; } retry: @@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); static const struct sdhci_ops sdhci_msm_ops = { - .platform_execute_tuning = sdhci_msm_execute_tuning, .reset = sdhci_reset, .set_clock = sdhci_msm_set_clock, .get_min_clock = sdhci_msm_get_min_clock, @@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) MSM_MMC_AUTOSUSPEND_DELAY_MS); pm_runtime_use_autosuspend(&pdev->dev); + host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning; ret = sdhci_add_host(host); if (ret) goto pm_runtime_disable;
platform_execute_tuning should not really exist as it does not do anything useful. So remove this ops and directly plug sdhci_msm_execute_tuning with mmc_host_ops. Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once HS400 related mode selection is done. Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> --- drivers/mmc/host/sdhci-msm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)