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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

NeilBrown and committed by

Ulf Hansson 11 years ago 40433267 f57ba4ca

-11

2 changed files

expand all

drivers

mmc

core

core.c

include

linux

mmc

host.h

-5

drivers/mmc/core/core.c

··· 920 920 wake_up(&host->wq); 921 921 spin_unlock_irqrestore(&host->lock, flags); 922 922 remove_wait_queue(&host->wq, &wait); 923 - if (host->ops->enable && !stop && host->claim_cnt == 1) 924 - host->ops->enable(host); 925 923 return stop; 926 924 } 927 925 ··· 937 939 unsigned long flags; 938 940 939 941 WARN_ON(!host->claimed); 940 - 941 - if (host->ops->disable && host->claim_cnt == 1) 942 - host->ops->disable(host); 943 942 944 943 spin_lock_irqsave(&host->lock, flags); 945 944 if (--host->claim_cnt) {

-6

include/linux/mmc/host.h

··· 80 80 81 81 struct 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 83 * It is optional for the host to implement pre_req and post_req in 90 84 * order to support double buffering of requests (prepare one 91 85 * request while another request is active).