diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2014-06-17 19:14:54 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-06-30 21:22:51 +0400 |
| commit | e1815053d6c3c4e2d89be0837509a76afadcc336 (patch) | |
| tree | 4d8ff803e5711e55a252be226f40c5077131bdc4 | |
| parent | ca118b78da329ee22d3072f1844f3e37375e94ac (diff) | |
| download | linux-e1815053d6c3c4e2d89be0837509a76afadcc336.tar.xz | |
usb: gadget: r8a66597-udc: use devm_ioremap_resource() for registers
trivial patch removing boilerplate clode.
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/r8a66597-udc.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index b698a490cc7d..4e86ec5cbecf 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) usb_del_gadget_udc(&r8a66597->gadget); del_timer_sync(&r8a66597->timer); - iounmap(r8a66597->reg); if (r8a66597->pdata->sudmac) iounmap(r8a66597->sudmac_reg); free_irq(platform_get_irq(pdev, 0), r8a66597); @@ -1877,11 +1876,9 @@ static int __init r8a66597_probe(struct platform_device *pdev) unsigned long irq_trigger; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - dev_err(&pdev->dev, "platform_get_resource error.\n"); - goto clean_up; - } + reg = devm_ioremap_resource(&pdev->dev, res); + if (!reg) + return -ENODEV; ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = ires->start; @@ -1893,13 +1890,6 @@ static int __init r8a66597_probe(struct platform_device *pdev) goto clean_up; } - reg = ioremap(res->start, resource_size(res)); - if (reg == NULL) { - ret = -ENOMEM; - dev_err(&pdev->dev, "ioremap error.\n"); - goto clean_up; - } - /* initialize ucd */ r8a66597 = kzalloc(sizeof(struct r8a66597), GFP_KERNEL); if (r8a66597 == NULL) { @@ -2007,8 +1997,6 @@ clean_up: r8a66597->ep0_req); kfree(r8a66597); } - if (reg) - iounmap(reg); return ret; } |