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 <[email protected]>
Signed-off-by: Chris Ball <[email protected]>
This commit is contained in:
Guennadi Liakhovetski 2012-05-01 15:40:15 +02:00 • committed by Chris Ball
commit 27410ee7e3
3 changed files with 20 additions and 7 deletions

View file

@ -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);

View file

@ -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);
}