On Fri, Jun 20, 2014 at 11:11:23PM +0530, Himangi Saraogi wrote: > This patch introduces the use of managed interface devm_ioremap_resource > for ioremap_nocache and request_mem_region and removes the corresponding > free functions in the probe and remove functions. > > Signed-off-by: Himangi Saraogi <himangi...@gmail.com> > Acked-by: Julia Lawall <julia.law...@lip6.fr>
Reviewed-by: Felipe Balbi <ba...@ti.com>
Acked-by: Felipe Balbi <ba...@ti.com>
> ---
> drivers/usb/host/xhci-plat.c | 24 ++++--------------------
> 1 file changed, 4 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 29d8adb..23eeb15 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -140,20 +140,12 @@ static int xhci_plat_probe(struct platform_device *pdev)
> hcd->rsrc_start = res->start;
> hcd->rsrc_len = resource_size(res);
>
> - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
> - driver->description)) {
> - dev_dbg(&pdev->dev, "controller already in use\n");
> - ret = -EBUSY;
> + hcd->regs = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(hcd->regs)) {
> + ret = PTR_ERR(hcd->regs);
> goto put_hcd;
> }
>
> - hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
> - if (!hcd->regs) {
> - dev_dbg(&pdev->dev, "error mapping memory\n");
> - ret = -EFAULT;
> - goto release_mem_region;
> - }
> -
> /*
> * Not all platforms have a clk so it is not an error if the
> * clock does not exists.
> @@ -162,7 +154,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
> if (!IS_ERR(clk)) {
> ret = clk_prepare_enable(clk);
> if (ret)
> - goto unmap_registers;
> + goto put_hcd;
> }
>
> ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
> @@ -207,12 +199,6 @@ disable_clk:
> if (!IS_ERR(clk))
> clk_disable_unprepare(clk);
>
> -unmap_registers:
> - iounmap(hcd->regs);
> -
> -release_mem_region:
> - release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
> -
> put_hcd:
> usb_put_hcd(hcd);
>
> @@ -231,8 +217,6 @@ static int xhci_plat_remove(struct platform_device *dev)
> usb_remove_hcd(hcd);
> if (!IS_ERR(clk))
> clk_disable_unprepare(clk);
> - iounmap(hcd->regs);
> - release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
> usb_put_hcd(hcd);
> kfree(xhci);
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
signature.asc
Description: Digital signature
