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>

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 3d368b830e7c74a42638c394bd4b441bdfa9b3e8..e897e7fc3b14cd996e3a04a8f0a98e24ef2e8ee6 100644 (file)
--- 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);