提交 40433267 编写于 作者: N NeilBrown 提交者: Ulf Hansson

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: NNeilBrown <neil@brown.name>
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
上级 f57ba4ca
...@@ -920,8 +920,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) ...@@ -920,8 +920,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
wake_up(&host->wq); wake_up(&host->wq);
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
remove_wait_queue(&host->wq, &wait); remove_wait_queue(&host->wq, &wait);
if (host->ops->enable && !stop && host->claim_cnt == 1)
host->ops->enable(host);
return stop; return stop;
} }
...@@ -940,9 +938,6 @@ void mmc_release_host(struct mmc_host *host) ...@@ -940,9 +938,6 @@ void mmc_release_host(struct mmc_host *host)
WARN_ON(!host->claimed); WARN_ON(!host->claimed);
if (host->ops->disable && host->claim_cnt == 1)
host->ops->disable(host);
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
if (--host->claim_cnt) { if (--host->claim_cnt) {
/* Release for nested claim */ /* Release for nested claim */
......
...@@ -79,12 +79,6 @@ struct mmc_ios { ...@@ -79,12 +79,6 @@ struct mmc_ios {
}; };
struct mmc_host_ops { 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 * It is optional for the host to implement pre_req and post_req in
* order to support double buffering of requests (prepare one * order to support double buffering of requests (prepare one
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册