aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorIan Molton <ian.molton@codethink.co.uk>2015-04-27 00:01:36 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-06-01 09:06:48 +0200
commitde501af98dfab9c41417bbf8b080b79110a4958c (patch)
tree6bd18503fb2511715786c69dee3efeff215d5010 /drivers/mmc
parentmmc: TMIO: Fix I/O mapping leak on error using devm_ioremap() (diff)
downloadlinux-dev-de501af98dfab9c41417bbf8b080b79110a4958c.tar.xz
linux-dev-de501af98dfab9c41417bbf8b080b79110a4958c.zip
mmc: TMIO: Use devm_request_irq()
Clean up resource allocation and freeing. Signed-off-by: Ian Molton <ian.molton@codethink.co.uk> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/tmio_mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 3d368b830e7c..e897e7fc3b14 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -103,7 +103,8 @@ static int tmio_mmc_probe(struct platform_device *pdev)
if (ret)
goto host_free;
- ret = request_irq(irq, tmio_mmc_irq, IRQF_TRIGGER_FALLING,
+ ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq,
+ IRQF_TRIGGER_FALLING,
dev_name(&pdev->dev), host);
if (ret)
goto host_remove;
@@ -131,7 +132,6 @@ static int tmio_mmc_remove(struct platform_device *pdev)
if (mmc) {
struct tmio_mmc_host *host = mmc_priv(mmc);
- free_irq(platform_get_irq(pdev, 0), host);
tmio_mmc_host_remove(host);
if (cell->disable)
cell->disable(pdev);