aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben.dooks@codethink.co.uk>2014-06-17 11:15:00 -0400
committerFelipe Balbi <balbi@ti.com>2014-06-30 13:26:28 -0400
commit4b526951c356c9270f1737ca4e100e9b420d8223 (patch)
tree406ca8b075ef68e1c05fe6f0bc7c56a9beab5776
parent3d7037b76ba81a35daf627391b67be6463e56353 (diff)
usb: gadget: r8a66597-udc: use devm_request_irq() to get device irq
Use the devm_request_irq() call to get the interrupt for the device and have it automatically free on exit. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/r8a66597-udc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 51eaedda2bb5..8414ba501d7c 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1826,7 +1826,6 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
1826 1826
1827 usb_del_gadget_udc(&r8a66597->gadget); 1827 usb_del_gadget_udc(&r8a66597->gadget);
1828 del_timer_sync(&r8a66597->timer); 1828 del_timer_sync(&r8a66597->timer);
1829 free_irq(platform_get_irq(pdev, 0), r8a66597);
1830 r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); 1829 r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
1831 1830
1832 if (r8a66597->pdata->on_chip) { 1831 if (r8a66597->pdata->on_chip) {
@@ -1918,8 +1917,8 @@ static int __init r8a66597_probe(struct platform_device *pdev)
1918 1917
1919 disable_controller(r8a66597); /* make sure controller is disabled */ 1918 disable_controller(r8a66597); /* make sure controller is disabled */
1920 1919
1921 ret = request_irq(irq, r8a66597_irq, IRQF_SHARED, 1920 ret = devm_request_irq(dev, irq, r8a66597_irq, IRQF_SHARED,
1922 udc_name, r8a66597); 1921 udc_name, r8a66597);
1923 if (ret < 0) { 1922 if (ret < 0) {
1924 dev_err(dev, "request_irq error (%d)\n", ret); 1923 dev_err(dev, "request_irq error (%d)\n", ret);
1925 goto clean_up2; 1924 goto clean_up2;
@@ -1969,7 +1968,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
1969err_add_udc: 1968err_add_udc:
1970 r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); 1969 r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
1971clean_up3: 1970clean_up3:
1972 free_irq(irq, r8a66597);
1973clean_up2: 1971clean_up2:
1974 if (r8a66597->pdata->on_chip) 1972 if (r8a66597->pdata->on_chip)
1975 clk_disable_unprepare(r8a66597->clk); 1973 clk_disable_unprepare(r8a66597->clk);