History

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.

NeilBrown committed 11 years ago

Commit 40433261 parent f57ba4c2 files · +0 −11Browse files

Unified · Split

2 files
  1. drivers/mmc/core/core.c +0 −5
  2. include/linux/mmc/host.h +0 −6
drivers/mmc/core/core.c+0−5
@@ -920,8 +920,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) · 919 unmodified lines
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) · 12 unmodified lines
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 */
include/linux/mmc/host.h+0−6
@@ -79,12 +79,6 @@ struct mmc_ios { · 78 unmodified lines
79};79};
80 80
81struct mmc_host_ops {81struct mmc_host_ops {
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 /*82 /*
89 * It is optional for the host to implement pre_req and post_req in83 * It is optional for the host to implement pre_req and post_req in
90 * order to support double buffering of requests (prepare one84 * order to support double buffering of requests (prepare one

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t