| Message ID | 20210709115344.16977-2-ashok.reddy.soma@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 8e34aa00e971b41764d03b335941f5bf14f605ac |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | This patch set fixes minor issues related to tapdelays | expand |
On 7/9/21 8:53 PM, Ashok Reddy Soma wrote: > set_phase() functions are not modifying the ret value and returning > the same uninitialized ret, return 0 instead. > > Keep the return type as int to return errors when the tapdelay's are > set via xilinx_pm_request() in future. > > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Best Regards, Jaehoon Chung > --- > > Changes in v3: > - Updated commmit description to explain why return type int is kept > - Change "@degree" to "@degrees:" in 5/6, so revert it in 1/6 from > sdhci_zynqmp_sampleclk_set_phase() and sdhci_versal_sdcardclk_set_phase() > > Changes in v2: > - Changed "@degree" to "@degrees:" in function descriptions of tap > delay functions > > drivers/mmc/zynq_sdhci.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c > index b79c4021b6..5bad5cb9e7 100644 > --- a/drivers/mmc/zynq_sdhci.c > +++ b/drivers/mmc/zynq_sdhci.c > @@ -183,7 +183,7 @@ static int arasan_sdhci_execute_tuning(struct mmc *mmc, u8 opcode) > * > * @host: Pointer to the sdhci_host structure. > * @degrees: The clock phase shift between 0 - 359. > - * Return: 0 on success and error value on error > + * Return: 0 > */ > static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, > int degrees) > @@ -191,7 +191,6 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, > struct arasan_sdhci_priv *priv = dev_get_priv(host->mmc->dev); > struct mmc *mmc = (struct mmc *)host->mmc; > u8 tap_delay, tap_max = 0; > - int ret; > int timing = mode2timing[mmc->selected_mode]; > > /* > @@ -229,7 +228,7 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, > > arasan_zynqmp_set_tapdelay(priv->deviceid, 0, tap_delay); > > - return ret; > + return 0; > } > > /** > @@ -239,7 +238,7 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, > * > * @host: Pointer to the sdhci_host structure. > * @degrees: The clock phase shift between 0 - 359. > - * Return: 0 on success and error value on error > + * Return: 0 > */ > static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, > int degrees) > @@ -247,7 +246,6 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, > struct arasan_sdhci_priv *priv = dev_get_priv(host->mmc->dev); > struct mmc *mmc = (struct mmc *)host->mmc; > u8 tap_delay, tap_max = 0; > - int ret; > int timing = mode2timing[mmc->selected_mode]; > > /* > @@ -285,7 +283,7 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, > > arasan_zynqmp_set_tapdelay(priv->deviceid, tap_delay, 0); > > - return ret; > + return 0; > } > > /** > @@ -295,14 +293,13 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, > * > * @host: Pointer to the sdhci_host structure. > * @degrees The clock phase shift between 0 - 359. > - * Return: 0 on success and error value on error > + * Return: 0 > */ > static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, > int degrees) > { > struct mmc *mmc = (struct mmc *)host->mmc; > u8 tap_delay, tap_max = 0; > - int ret; > int timing = mode2timing[mmc->selected_mode]; > > /* > @@ -349,7 +346,7 @@ static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, > sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER); > } > > - return ret; > + return 0; > } > > /** > @@ -359,14 +356,13 @@ static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, > * > * @host: Pointer to the sdhci_host structure. > * @degrees The clock phase shift between 0 - 359. > - * Return: 0 on success and error value on error > + * Return: 0 > */ > static int sdhci_versal_sampleclk_set_phase(struct sdhci_host *host, > int degrees) > { > struct mmc *mmc = (struct mmc *)host->mmc; > u8 tap_delay, tap_max = 0; > - int ret; > int timing = mode2timing[mmc->selected_mode]; > > /* > @@ -417,7 +413,7 @@ static int sdhci_versal_sampleclk_set_phase(struct sdhci_host *host, > sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER); > } > > - return ret; > + return 0; > } > > static void arasan_sdhci_set_tapdelay(struct sdhci_host *host) >
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index b79c4021b6..5bad5cb9e7 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -183,7 +183,7 @@ static int arasan_sdhci_execute_tuning(struct mmc *mmc, u8 opcode) * * @host: Pointer to the sdhci_host structure. * @degrees: The clock phase shift between 0 - 359. - * Return: 0 on success and error value on error + * Return: 0 */ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, int degrees) @@ -191,7 +191,6 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, struct arasan_sdhci_priv *priv = dev_get_priv(host->mmc->dev); struct mmc *mmc = (struct mmc *)host->mmc; u8 tap_delay, tap_max = 0; - int ret; int timing = mode2timing[mmc->selected_mode]; /* @@ -229,7 +228,7 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, arasan_zynqmp_set_tapdelay(priv->deviceid, 0, tap_delay); - return ret; + return 0; } /** @@ -239,7 +238,7 @@ static int sdhci_zynqmp_sdcardclk_set_phase(struct sdhci_host *host, * * @host: Pointer to the sdhci_host structure. * @degrees: The clock phase shift between 0 - 359. - * Return: 0 on success and error value on error + * Return: 0 */ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, int degrees) @@ -247,7 +246,6 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, struct arasan_sdhci_priv *priv = dev_get_priv(host->mmc->dev); struct mmc *mmc = (struct mmc *)host->mmc; u8 tap_delay, tap_max = 0; - int ret; int timing = mode2timing[mmc->selected_mode]; /* @@ -285,7 +283,7 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, arasan_zynqmp_set_tapdelay(priv->deviceid, tap_delay, 0); - return ret; + return 0; } /** @@ -295,14 +293,13 @@ static int sdhci_zynqmp_sampleclk_set_phase(struct sdhci_host *host, * * @host: Pointer to the sdhci_host structure. * @degrees The clock phase shift between 0 - 359. - * Return: 0 on success and error value on error + * Return: 0 */ static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, int degrees) { struct mmc *mmc = (struct mmc *)host->mmc; u8 tap_delay, tap_max = 0; - int ret; int timing = mode2timing[mmc->selected_mode]; /* @@ -349,7 +346,7 @@ static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, sdhci_writel(host, regval, SDHCI_ARASAN_OTAPDLY_REGISTER); } - return ret; + return 0; } /** @@ -359,14 +356,13 @@ static int sdhci_versal_sdcardclk_set_phase(struct sdhci_host *host, * * @host: Pointer to the sdhci_host structure. * @degrees The clock phase shift between 0 - 359. - * Return: 0 on success and error value on error + * Return: 0 */ static int sdhci_versal_sampleclk_set_phase(struct sdhci_host *host, int degrees) { struct mmc *mmc = (struct mmc *)host->mmc; u8 tap_delay, tap_max = 0; - int ret; int timing = mode2timing[mmc->selected_mode]; /* @@ -417,7 +413,7 @@ static int sdhci_versal_sampleclk_set_phase(struct sdhci_host *host, sdhci_writel(host, regval, SDHCI_ARASAN_ITAPDLY_REGISTER); } - return ret; + return 0; } static void arasan_sdhci_set_tapdelay(struct sdhci_host *host)
set_phase() functions are not modifying the ret value and returning the same uninitialized ret, return 0 instead. Keep the return type as int to return errors when the tapdelay's are set via xilinx_pm_request() in future. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> --- Changes in v3: - Updated commmit description to explain why return type int is kept - Change "@degree" to "@degrees:" in 5/6, so revert it in 1/6 from sdhci_zynqmp_sampleclk_set_phase() and sdhci_versal_sdcardclk_set_phase() Changes in v2: - Changed "@degree" to "@degrees:" in function descriptions of tap delay functions drivers/mmc/zynq_sdhci.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)