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

Commit 000b611e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "mmc: core: add helpers mmc_regulator_enable/disable_vqmmc" 



This reverts commit a1f29e99 which is
commit 8d91f3f8ae57e6292142ca89f322e90fa0d6ac02 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I80d2d352368f49f148db0b68ae1ea6c8f432cb98
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent ee67cef1

drivers/mmc/core/regulator.c

+0 −41
Original line number Diff line number Diff line
@@ -258,44 +258,3 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) 
	return 0;

}

EXPORT_SYMBOL_GPL(mmc_regulator_get_supply);
 


/**

 * mmc_regulator_enable_vqmmc - enable VQMMC regulator for a host

 * @mmc: the host to regulate

 *

 * Returns 0 or errno. Enables the regulator for vqmmc.

 * Keeps track of the enable status for ensuring that calls to

 * regulator_enable/disable are balanced.

 */

int mmc_regulator_enable_vqmmc(struct mmc_host *mmc)

{

	int ret = 0;



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

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

		if (ret < 0)

			dev_err(mmc_dev(mmc), "enabling vqmmc regulator failed\n");

		else

			mmc->vqmmc_enabled = true;

	}



	return ret;

}

EXPORT_SYMBOL_GPL(mmc_regulator_enable_vqmmc);



/**

 * mmc_regulator_disable_vqmmc - disable VQMMC regulator for a host

 * @mmc: the host to regulate

 *

 * Returns 0 or errno. Disables the regulator for vqmmc.

 * Keeps track of the enable status for ensuring that calls to

 * regulator_enable/disable are balanced.

 */

void mmc_regulator_disable_vqmmc(struct mmc_host *mmc)

{

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

		regulator_disable(mmc->supply.vqmmc);

		mmc->vqmmc_enabled = false;

	}

}

EXPORT_SYMBOL_GPL(mmc_regulator_disable_vqmmc);

include/linux/mmc/host.h

+0 −3
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ struct mmc_host { 
	unsigned int		use_blk_mq:1;	/* use blk-mq */

	unsigned int		retune_crc_disable:1; /* don't trigger retune upon crc */

	unsigned int		can_dma_map_merge:1; /* merging can be used */

	unsigned int		vqmmc_enabled:1; /* vqmmc regulator is enabled */



	int			rescan_disable;	/* disable card detection */

	int			rescan_entered;	/* used with nonremovable devices */
@@ -552,8 +551,6 @@ static inline int mmc_regulator_set_vqmmc(struct mmc_host *mmc, 
#endif



int mmc_regulator_get_supply(struct mmc_host *mmc);

int mmc_regulator_enable_vqmmc(struct mmc_host *mmc);

void mmc_regulator_disable_vqmmc(struct mmc_host *mmc);



static inline int mmc_card_is_removable(struct mmc_host *host)

{