aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/core/core.c5
-rw-r--r--include/linux/mmc/host.h6
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 23f10f72e5f3..709ada9f26b5 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -920,8 +920,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
920 wake_up(&host->wq); 920 wake_up(&host->wq);
921 spin_unlock_irqrestore(&host->lock, flags); 921 spin_unlock_irqrestore(&host->lock, flags);
922 remove_wait_queue(&host->wq, &wait); 922 remove_wait_queue(&host->wq, &wait);
923 if (host->ops->enable && !stop && host->claim_cnt == 1)
924 host->ops->enable(host);
925 return stop; 923 return stop;
926} 924}
927 925
@@ -940,9 +938,6 @@ void mmc_release_host(struct mmc_host *host)
940 938
941 WARN_ON(!host->claimed); 939 WARN_ON(!host->claimed);
942 940
943 if (host->ops->disable && host->claim_cnt == 1)
944 host->ops->disable(host);
945
946 spin_lock_irqsave(&host->lock, flags); 941 spin_lock_irqsave(&host->lock, flags);
947 if (--host->claim_cnt) { 942 if (--host->claim_cnt) {
948 /* Release for nested claim */ 943 /* Release for nested claim */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 0c8cbe5d1550..b5bedaec6223 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -80,12 +80,6 @@ struct mmc_ios {
80 80
81struct mmc_host_ops { 81struct mmc_host_ops {
82 /* 82 /*
83 * 'enable' is called when the host is claimed and 'disable' is called
84 * when the host is released. 'enable' and 'disable' are deprecated.
85 */
86 int (*enable)(struct mmc_host *host);
87 int (*disable)(struct mmc_host *host);
88 /*
89 * It is optional for the host to implement pre_req and post_req in 83 * It is optional for the host to implement pre_req and post_req in
90 * order to support double buffering of requests (prepare one 84 * order to support double buffering of requests (prepare one
91 * request while another request is active). 85 * request while another request is active).