Commit 40433267 authored by NeilBrown's avatar NeilBrown Committed by Ulf Hansson
Browse files

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



These callbacks have been set to deprecated for some time. The last
user (omap_hsmmc) has moved away from using them, which thus enables
us to completely remove them.

Signed-off-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f57ba4ca

drivers/mmc/core/core.c

+0 −5
Original line number Diff line number Diff line
@@ -920,8 +920,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) 
		wake_up(&host->wq);

	spin_unlock_irqrestore(&host->lock, flags);

	remove_wait_queue(&host->wq, &wait);

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

		host->ops->enable(host);

	return stop;

}
@@ -940,9 +938,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -79,12 +79,6 @@ 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