evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: gadget: r8a66597-udc: handle sudmac registers with devm_ioremap_resource()

Browse source 
Change the sudmac register handling in the devm_ioremap_resource
to use the devm variant.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Ben Dooks 2014-06-17 16:14:57 +01:00 • committed by Felipe Balbi
parent 531bc938f9
commit 9a6d5d4475
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/usb/gadget/r8a66597-udc.c
View file

@ -1826,8 +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);
if (r8a66597->pdata->sudmac)
iounmap(r8a66597->sudmac_reg);
free_irq(platform_get_irq(pdev, 0), r8a66597); 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);
@ -1849,15 +1847,10 @@ static int __init r8a66597_sudmac_ioremap(struct r8a66597 *r8a66597,
struct resource *res; struct resource *res;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sudmac"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sudmac");
if (!res) { r8a66597->sudmac_reg = devm_ioremap_resource(&pdev->dev, res);
dev_err(&pdev->dev, "platform_get_resource error(sudmac).\n"); if (IS_ERR(r8a66597->sudmac_reg)) {
return -ENODEV;
}
r8a66597->sudmac_reg = ioremap(res->start, resource_size(res));
if (r8a66597->sudmac_reg == NULL) {
dev_err(&pdev->dev, "ioremap error(sudmac).\n"); dev_err(&pdev->dev, "ioremap error(sudmac).\n");
return -ENOMEM; return PTR_ERR(r8a66597->sudmac_reg);
} }
return 0; return 0;
@ -1987,8 +1980,6 @@ clean_up2:
} }
clean_up: clean_up:
if (r8a66597) { if (r8a66597) {
if (r8a66597->sudmac_reg)
iounmap(r8a66597->sudmac_reg);
if (r8a66597->ep0_req) if (r8a66597->ep0_req)
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597_free_request(&r8a66597->ep[0].ep,
r8a66597->ep0_req); r8a66597->ep0_req);