diff options
| author | Magnus Damm <damm@opensource.se> | 2011-05-06 11:02:33 +0000 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-05-24 23:53:52 -0400 |
| commit | 8e7bfdb37ac001c95d2c768932b57de1019409cd (patch) | |
| tree | 8b91c25442de01ce415563ae60ee30eb8d7e6e3c /drivers/mmc/host/tmio_mmc_pio.c | |
| parent | df3ef2d3c92c0a562ebde3699af7d12401fddf60 (diff) | |
| download | talos-op-linux-8e7bfdb37ac001c95d2c768932b57de1019409cd.tar.gz talos-op-linux-8e7bfdb37ac001c95d2c768932b57de1019409cd.zip | |
mmc: tmio/sdhi: break out interrupt request/free
Move request_irq()/free_irq() from the shared code
in tmio_mmc.c into the SDHI/tmio specific portion
in sh_mobile_sdhi.c and tmio_mmc_pio.c.
This is ground work to allow us to adjust the SDHI
code with IRQ flags and number of interupt sources.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/tmio_mmc_pio.c')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index ea6ade31bcc7..af5d4f6d2233 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -564,7 +564,7 @@ out: spin_unlock(&host->lock); } -static irqreturn_t tmio_mmc_irq(int irq, void *devid) +irqreturn_t tmio_mmc_irq(int irq, void *devid) { struct tmio_mmc_host *host = devid; struct tmio_mmc_data *pdata = host->pdata; @@ -659,6 +659,7 @@ static irqreturn_t tmio_mmc_irq(int irq, void *devid) out: return IRQ_HANDLED; } +EXPORT_SYMBOL(tmio_mmc_irq); static int tmio_mmc_start_data(struct tmio_mmc_host *host, struct mmc_data *data) @@ -893,21 +894,10 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host, tmio_mmc_clk_stop(_host); tmio_mmc_reset(_host); - ret = platform_get_irq(pdev, 0); - if (ret < 0) - goto pm_suspend; - - _host->irq = ret; - tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL); if (pdata->flags & TMIO_MMC_SDIO_IRQ) tmio_mmc_enable_sdio_irq(mmc, 0); - ret = request_irq(_host->irq, tmio_mmc_irq, IRQF_DISABLED | - IRQF_TRIGGER_FALLING, dev_name(&pdev->dev), _host); - if (ret) - goto pm_suspend; - spin_lock_init(&_host->lock); /* Init delayed work for request timeouts */ @@ -933,8 +923,6 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host, return 0; -pm_suspend: - pm_runtime_suspend(&pdev->dev); pm_disable: pm_runtime_disable(&pdev->dev); iounmap(_host->ctl); @@ -952,7 +940,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) mmc_remove_host(host->mmc); cancel_delayed_work_sync(&host->delayed_reset_work); tmio_mmc_release_dma(host); - free_irq(host->irq, host); iounmap(host->ctl); mmc_free_host(host->mmc); |
