Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa0e05e authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

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: 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 e1538ed7

drivers/mmc/host/omap_hsmmc.c

+3 −6
Original line number Diff line number Diff line
@@ -2043,9 +2043,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 


	/* Request IRQ for card detect */

	if ((mmc_slot(host).card_detect_irq)) {

		ret = request_threaded_irq(mmc_slot(host).card_detect_irq,

					   NULL,

					   omap_hsmmc_detect,

		ret = devm_request_threaded_irq(&pdev->dev,

						mmc_slot(host).card_detect_irq,

						NULL, omap_hsmmc_detect,

					   IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

					   mmc_hostname(mmc), host);

		if (ret) {
@@ -2088,7 +2088,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 


err_slot_name:

	mmc_remove_host(mmc);

	free_irq(mmc_slot(host).card_detect_irq, host);

err_irq_cd:

	if (host->use_reg)

		omap_hsmmc_reg_put(host);
@@ -2127,8 +2126,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev) 
		omap_hsmmc_reg_put(host);

	if (host->pdata->cleanup)

		host->pdata->cleanup(&pdev->dev);

	if (mmc_slot(host).card_detect_irq)

		free_irq(mmc_slot(host).card_detect_irq, host);



	if (host->tx_chan)

		dma_release_channel(host->tx_chan);