summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-01 13:40:15 (GMT)
committerChris Ball <cjb@laptop.org>2012-07-21 04:02:16 (GMT)
commit27410ee7e391ce650d6d0242805f080599be7ad7 (patch)
treeca1a99eb74e56504be7d2bf34fecf11271f361b5 /drivers/mmc
parent7d17baa05da6a2e64ee15011cdf4319bd3e0ff61 (diff)
downloadlinux-27410ee7e391ce650d6d0242805f080599be7ad7.tar.xz
mmc: core: use a more generic name for slot function types and fields
struct mmc_host::hotplug is becoming a generic hook for slot functions. Rename it accordingly. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/host.c2
-rw-r--r--drivers/mmc/core/slot-gpio.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 91c84c7..b8c5290 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -327,6 +327,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
mmc_host_clk_init(host);
+ host->slot.cd_irq = -EINVAL;
+
spin_lock_init(&host->lock);
init_waitqueue_head(&host->wq);
INIT_DELAYED_WORK(&host->detect, mmc_rescan);
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 9796710..468e5a0 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -56,8 +56,8 @@ int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio)
goto eirqreq;
ctx->cd_gpio = gpio;
- host->hotplug.irq = irq;
- host->hotplug.handler_priv = ctx;
+ host->slot.cd_irq = irq;
+ host->slot.handler_priv = ctx;
return 0;
@@ -71,12 +71,12 @@ EXPORT_SYMBOL(mmc_gpio_request_cd);
void mmc_gpio_free_cd(struct mmc_host *host)
{
- struct mmc_gpio *ctx = host->hotplug.handler_priv;
+ struct mmc_gpio *ctx = host->slot.handler_priv;
if (!ctx)
return;
- free_irq(host->hotplug.irq, host);
+ free_irq(host->slot.cd_irq, host);
gpio_free(ctx->cd_gpio);
kfree(ctx);
}