Commit 4b526951 authored by Ben Dooks's avatar Ben Dooks Committed by Felipe Balbi

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: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 3d7037b7
...@@ -1826,7 +1826,6 @@ static int __exit r8a66597_remove(struct platform_device *pdev) ...@@ -1826,7 +1826,6 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
usb_del_gadget_udc(&r8a66597->gadget); usb_del_gadget_udc(&r8a66597->gadget);
del_timer_sync(&r8a66597->timer); del_timer_sync(&r8a66597->timer);
free_irq(platform_get_irq(pdev, 0), r8a66597);
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
if (r8a66597->pdata->on_chip) { if (r8a66597->pdata->on_chip) {
...@@ -1918,8 +1917,8 @@ static int __init r8a66597_probe(struct platform_device *pdev) ...@@ -1918,8 +1917,8 @@ static int __init r8a66597_probe(struct platform_device *pdev)
disable_controller(r8a66597); /* make sure controller is disabled */ disable_controller(r8a66597); /* make sure controller is disabled */
ret = request_irq(irq, r8a66597_irq, IRQF_SHARED, ret = devm_request_irq(dev, irq, r8a66597_irq, IRQF_SHARED,
udc_name, r8a66597); udc_name, r8a66597);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "request_irq error (%d)\n", ret); dev_err(dev, "request_irq error (%d)\n", ret);
goto clean_up2; goto clean_up2;
...@@ -1969,7 +1968,6 @@ static int __init r8a66597_probe(struct platform_device *pdev) ...@@ -1969,7 +1968,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
err_add_udc: err_add_udc:
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
clean_up3: clean_up3:
free_irq(irq, r8a66597);
clean_up2: clean_up2:
if (r8a66597->pdata->on_chip) if (r8a66597->pdata->on_chip)
clk_disable_unprepare(r8a66597->clk); clk_disable_unprepare(r8a66597->clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment