Skip to content

Commit

Permalink
mmc: core: Remove the ->enable|disable() callbacks
Browse files Browse the repository at this point in the history
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: NeilBrown <neil@brown.name>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
neilbrown authored and storulf committed Mar 27, 2015
1 parent f57ba4c commit 4043326
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
5 changes: 0 additions & 5 deletions drivers/mmc/core/core.c
Expand Up @@ -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;
}

Expand All @@ -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 */
Expand Down
6 changes: 0 additions & 6 deletions include/linux/mmc/host.h
Expand Up @@ -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
Expand Down

0 comments on commit 4043326

Please sign in to comment.