Commit e1538ed7 authored by Balaji T K's avatar Balaji T K Committed by Chris Ball

mmc: omap_hsmmc: use devm_request_irq

With devm_request_irq conversion free_irq can be removed in clean up path
Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 9618195e
...@@ -2017,7 +2017,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) ...@@ -2017,7 +2017,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
} }
/* Request IRQ for MMC operations */ /* Request IRQ for MMC operations */
ret = request_irq(host->irq, omap_hsmmc_irq, 0, ret = devm_request_irq(&pdev->dev, host->irq, omap_hsmmc_irq, 0,
mmc_hostname(mmc), host); mmc_hostname(mmc), host);
if (ret) { if (ret) {
dev_err(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n"); dev_err(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
...@@ -2028,7 +2028,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) ...@@ -2028,7 +2028,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
if (pdata->init(&pdev->dev) != 0) { if (pdata->init(&pdev->dev) != 0) {
dev_err(mmc_dev(host->mmc), dev_err(mmc_dev(host->mmc),
"Unable to configure MMC IRQs\n"); "Unable to configure MMC IRQs\n");
goto err_irq_cd_init; goto err_irq;
} }
} }
...@@ -2095,8 +2095,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev) ...@@ -2095,8 +2095,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
err_reg: err_reg:
if (host->pdata->cleanup) if (host->pdata->cleanup)
host->pdata->cleanup(&pdev->dev); host->pdata->cleanup(&pdev->dev);
err_irq_cd_init:
free_irq(host->irq, host);
err_irq: err_irq:
if (host->tx_chan) if (host->tx_chan)
dma_release_channel(host->tx_chan); dma_release_channel(host->tx_chan);
...@@ -2129,7 +2127,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev) ...@@ -2129,7 +2127,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
omap_hsmmc_reg_put(host); omap_hsmmc_reg_put(host);
if (host->pdata->cleanup) if (host->pdata->cleanup)
host->pdata->cleanup(&pdev->dev); host->pdata->cleanup(&pdev->dev);
free_irq(host->irq, host);
if (mmc_slot(host).card_detect_irq) if (mmc_slot(host).card_detect_irq)
free_irq(mmc_slot(host).card_detect_irq, host); free_irq(mmc_slot(host).card_detect_irq, host);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment