Commit eab234fc authored by Yang Li's avatar Yang Li Committed by Ulf Hansson
Browse files

mmc: omap_hsmmc: Simplify bool comparison and conversion 



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: default avatarAbaci <Robot&lt;abaci@linux.alibaba.com>
Signed-off-by: default avatarYang Li <abaci-bugfix@linux.alibaba.com>
Link: https://lore.kernel.org/r/1610704281-11036-1-git-send-email-abaci-bugfix@linux.alibaba.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6b1dc622

drivers/mmc/host/omap_hsmmc.c

+9 −9
Original line number Diff line number Diff line
@@ -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);