Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db90f91f authored by Lee Jones's avatar Lee Jones Committed by Russell King
Browse files

ARM: 7714/1: mmc: mmci: Ensure return value of regulator_enable() is checked 



This patch suppresses the warning below:

drivers/mmc/host/mmci.c: In function ‘mmci_set_ios’:
drivers/mmc/host/mmci.c:1165:20: warning: ignoring return value of
        ‘regulator_enable’, declared with attribute warn_unused_result
        [-Wunused-result]

Cc: Chris Ball <cjb@laptop.org>
Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c01c5a50

drivers/mmc/host/mmci.c

+7 −2
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	struct variant_data *variant = host->variant;

	u32 pwr = 0;

	unsigned long flags;

	int ret;



	pm_runtime_get_sync(mmc_dev(mmc));
@@ -1161,8 +1162,12 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		break;

	case MMC_POWER_ON:

		if (!IS_ERR(mmc->supply.vqmmc) &&

		    !regulator_is_enabled(mmc->supply.vqmmc))

			regulator_enable(mmc->supply.vqmmc);

		    !regulator_is_enabled(mmc->supply.vqmmc)) {

			ret = regulator_enable(mmc->supply.vqmmc);

			if (ret < 0)

				dev_err(mmc_dev(mmc),

					"failed to enable vqmmc regulator\n");

		}



		pwr |= MCI_PWR_ON;

		break;