On Fri, 15 Jan 2021 at 10:51, Yang Li <abaci-bugfix@xxxxxxxxxxxxxxxxx> wrote: > > Fix the following coccicheck warning: > ./drivers/mmc/host/omap_hsmmc.c:297:6-25: WARNING: Comparison of 0/1 to > bool variable > > According to the context, vqmmc_enabled is more suitable for bool > type. > > Reported-by: Abaci Robot<abaci@xxxxxxxxxxxxxxxxx> > Signed-off-by: Yang Li <abaci-bugfix@xxxxxxxxxxxxxxxxx> Applied for next, thanks! Kind regards Uffe > --- > Changes in v2: > -clean up all use of "pbias_enabled", and do the same clean up for > "vqmmc_enabled". > > drivers/mmc/host/omap_hsmmc.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index aa9cc49..2f8038d 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -177,7 +177,7 @@ struct omap_hsmmc_host { > struct regulator *pbias; > bool pbias_enabled; > void __iomem *base; > - int vqmmc_enabled; > + bool vqmmc_enabled; > resource_size_t mapbase; > spinlock_t irq_lock; /* Prevent races with irq handler */ > unsigned int dma_len; > @@ -232,7 +232,7 @@ static int omap_hsmmc_enable_supply(struct mmc_host *mmc) > dev_err(mmc_dev(mmc), "vmmc_aux reg enable failed\n"); > goto err_vqmmc; > } > - host->vqmmc_enabled = 1; > + host->vqmmc_enabled = true; > } > > return 0; > @@ -256,7 +256,7 @@ static int omap_hsmmc_disable_supply(struct mmc_host *mmc) > dev_err(mmc_dev(mmc), "vmmc_aux reg disable failed\n"); > return ret; > } > - host->vqmmc_enabled = 0; > + host->vqmmc_enabled = false; > } > > if (!IS_ERR(mmc->supply.vmmc)) { > @@ -285,22 +285,22 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on) > return 0; > > if (power_on) { > - if (host->pbias_enabled == 0) { > + if (!host->pbias_enabled) { > ret = regulator_enable(host->pbias); > if (ret) { > dev_err(host->dev, "pbias reg enable fail\n"); > return ret; > } > - host->pbias_enabled = 1; > + host->pbias_enabled = true; > } > } else { > - if (host->pbias_enabled == 1) { > + if (host->pbias_enabled) { > ret = regulator_disable(host->pbias); > if (ret) { > dev_err(host->dev, "pbias reg disable fail\n"); > return ret; > } > - host->pbias_enabled = 0; > + host->pbias_enabled = false; > } > } > > @@ -1861,8 +1861,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev) > host->base = base + pdata->reg_offset; > host->power_mode = MMC_POWER_OFF; > host->next_data.cookie = 1; > - host->pbias_enabled = 0; > - host->vqmmc_enabled = 0; > + host->pbias_enabled = false; > + host->vqmmc_enabled = false; > > platform_set_drvdata(pdev, host); > > -- > 1.8.3.1 >