summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2014-11-26 13:44:22 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-26 09:28:11 -0800
commit4c503dd5fbdc33118d27f60e5c364d364980d4fd (patch)
tree37a4909a26737879a0f723fcdd1545dfcc883aaa
parent2d4d9f35bab1cad7f83d10864291d1e50b12c3f9 (diff)
downloadtalos-op-linux-4c503dd5fbdc33118d27f60e5c364d364980d4fd.tar.gz
talos-op-linux-4c503dd5fbdc33118d27f60e5c364d364980d4fd.zip
usb: chipidea: using devm_request_irq to instead of request_irq
Using devm_request_irq to instead of request_irq. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/chipidea/core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 60578d9c896d..5de1507b798c 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -759,8 +759,8 @@ static int ci_hdrc_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, ci);
- ret = request_irq(ci->irq, ci_irq, IRQF_SHARED, ci->platdata->name,
- ci);
+ ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED,
+ ci->platdata->name, ci);
if (ret)
goto stop;
@@ -771,7 +771,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
if (!ret)
return 0;
- free_irq(ci->irq, ci);
stop:
ci_role_destroy(ci);
deinit_phy:
@@ -785,7 +784,6 @@ static int ci_hdrc_remove(struct platform_device *pdev)
struct ci_hdrc *ci = platform_get_drvdata(pdev);
dbg_remove_files(ci);
- free_irq(ci->irq, ci);
ci_role_destroy(ci);
ci_hdrc_enter_lpm(ci, true);
ci_usb_phy_exit(ci);
OpenPOWER on IntegriCloud