diff options
author | Peter Chen <peter.chen@freescale.com> | 2014-11-26 00:44:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 12:28:11 -0500 |
commit | 4c503dd5fbdc33118d27f60e5c364d364980d4fd (patch) | |
tree | 37a4909a26737879a0f723fcdd1545dfcc883aaa /drivers/usb/chipidea/core.c | |
parent | 2d4d9f35bab1cad7f83d10864291d1e50b12c3f9 (diff) |
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>
Diffstat (limited to 'drivers/usb/chipidea/core.c')
-rw-r--r-- | drivers/usb/chipidea/core.c | 6 |
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) | |||
759 | } | 759 | } |
760 | 760 | ||
761 | platform_set_drvdata(pdev, ci); | 761 | platform_set_drvdata(pdev, ci); |
762 | ret = request_irq(ci->irq, ci_irq, IRQF_SHARED, ci->platdata->name, | 762 | ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED, |
763 | ci); | 763 | ci->platdata->name, ci); |
764 | if (ret) | 764 | if (ret) |
765 | goto stop; | 765 | goto stop; |
766 | 766 | ||
@@ -771,7 +771,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) | |||
771 | if (!ret) | 771 | if (!ret) |
772 | return 0; | 772 | return 0; |
773 | 773 | ||
774 | free_irq(ci->irq, ci); | ||
775 | stop: | 774 | stop: |
776 | ci_role_destroy(ci); | 775 | ci_role_destroy(ci); |
777 | deinit_phy: | 776 | deinit_phy: |
@@ -785,7 +784,6 @@ static int ci_hdrc_remove(struct platform_device *pdev) | |||
785 | struct ci_hdrc *ci = platform_get_drvdata(pdev); | 784 | struct ci_hdrc *ci = platform_get_drvdata(pdev); |
786 | 785 | ||
787 | dbg_remove_files(ci); | 786 | dbg_remove_files(ci); |
788 | free_irq(ci->irq, ci); | ||
789 | ci_role_destroy(ci); | 787 | ci_role_destroy(ci); |
790 | ci_hdrc_enter_lpm(ci, true); | 788 | ci_hdrc_enter_lpm(ci, true); |
791 | ci_usb_phy_exit(ci); | 789 | ci_usb_phy_exit(ci); |