On 17 March 2017 at 10:04, Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx> wrote: > From: Masaharu Hayakawa <masaharu.hayakawa.ry@xxxxxxxxxxx> > > Current code gets number of taps only once and keeps the value. This is > not correct, we need to obtain it every time before executing tuning, > so remove the outer if-block. > > Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@xxxxxxxxxxx> > [wsa: extracted from a larger patch and reworded commit message] > Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/tmio_mmc_pio.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index 5b01d22932cdbf..a2d92f10501bdd 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -815,16 +815,14 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode) > struct tmio_mmc_host *host = mmc_priv(mmc); > int i, ret = 0; > > - if (!host->tap_num) { > - if (!host->init_tuning || !host->select_tuning) > - /* Tuning is not supported */ > - goto out; > + if (!host->init_tuning || !host->select_tuning) > + /* Tuning is not supported */ > + goto out; > > - host->tap_num = host->init_tuning(host); > - if (!host->tap_num) > - /* Tuning is not supported */ > - goto out; > - } > + host->tap_num = host->init_tuning(host); > + if (!host->tap_num) > + /* Tuning is not supported */ > + goto out; > > if (host->tap_num * 2 >= sizeof(host->taps) * BITS_PER_BYTE) { > dev_warn_once(&host->pdev->dev, > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html