tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mmc: omap_hsmmc: use devm_request_threaded_irq

With devm_request_threaded_irq conversion free_irq can be removed
in clean up path

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

authored by

Balaji T K and committed by
Chris Ball 9fa0e05e e1538ed7

+3 -6
+3 -6
drivers/mmc/host/omap_hsmmc.c
··· 2043 2043 2044 2044 /* Request IRQ for card detect */ 2045 2045 if ((mmc_slot(host).card_detect_irq)) { 2046 - ret = request_threaded_irq(mmc_slot(host).card_detect_irq, 2047 - NULL, 2048 - omap_hsmmc_detect, 2046 + ret = devm_request_threaded_irq(&pdev->dev, 2047 + mmc_slot(host).card_detect_irq, 2048 + NULL, omap_hsmmc_detect, 2049 2049 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 2050 2050 mmc_hostname(mmc), host); 2051 2051 if (ret) { ··· 2088 2088 2089 2089 err_slot_name: 2090 2090 mmc_remove_host(mmc); 2091 - free_irq(mmc_slot(host).card_detect_irq, host); 2092 2091 err_irq_cd: 2093 2092 if (host->use_reg) 2094 2093 omap_hsmmc_reg_put(host); ··· 2126 2127 omap_hsmmc_reg_put(host); 2127 2128 if (host->pdata->cleanup) 2128 2129 host->pdata->cleanup(&pdev->dev); 2129 - if (mmc_slot(host).card_detect_irq) 2130 - free_irq(mmc_slot(host).card_detect_irq, host); 2131 2130 2132 2131 if (host->tx_chan) 2133 2132 dma_release_channel(host->tx_chan);