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

Commit 480a79e8 authored by Subhash Jadavani's avatar Subhash Jadavani Committed by xiaonian
Browse files

Revert "mmc: core: Remove the ->enable|disable() callbacks" 



This reverts commit 40433267 as
MSM platforms still needs ->enable/disable() callbacks.

Conflicts:
	drivers/mmc/core/core.c

Change-Id: Ifd986825c10f1475bfcdac37ea1f3b99e5f6daaf
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
parent a7f3c573

drivers/mmc/core/core.c

+6 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,9 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) 
	if (pm)

		pm_runtime_get_sync(mmc_dev(host));



	if (host->ops->enable && !stop && host->claim_cnt == 1)

		host->ops->enable(host);



	return stop;

}

EXPORT_SYMBOL(__mmc_claim_host);
@@ -1106,6 +1109,9 @@ void mmc_release_host(struct mmc_host *host) 


	WARN_ON(!host->claimed);



	if (host->ops->disable && host->claim_cnt == 1)

		host->ops->disable(host);



	spin_lock_irqsave(&host->lock, flags);

	if (--host->claim_cnt) {

		/* Release for nested claim */

include/linux/mmc/host.h

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ struct mmc_ios { 
};



struct mmc_host_ops {

	/*

	 * 'enable' is called when the host is claimed and 'disable' is called

	 * when the host is released. 'enable' and 'disable' are deprecated.

	 */

	int (*enable)(struct mmc_host *host);

	int (*disable)(struct mmc_host *host);

	/*

	 * It is optional for the host to implement pre_req and post_req in

	 * order to support double buffering of requests (prepare one