lkml.org 
[lkml]   [2014]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] usb: host: xhci-plat: use devm_functions
Hello.

On 06/20/2014 08:48 PM, 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 <himangi774@gmail.com>
> ---
> drivers/usb/host/xhci-plat.c | 25 +++++--------------------
> 1 file changed, 5 insertions(+), 20 deletions(-)

> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 29d8adb..31d14a5 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -140,18 +140,11 @@ 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;
> - goto put_hcd;
> - }
> -
> - hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
> - if (!hcd->regs) {
> + hcd->regs = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(hcd->regs)) {
> dev_dbg(&pdev->dev, "error mapping memory\n");

This line is worth removing -- devm_ioremap_resource() complains loudly on
errors.

> - ret = -EFAULT;
> - goto release_mem_region;
> + ret = PTR_ERR(hcd->regs);
> + goto put_hcd;
> }

WBR, Sergei



\
 
 \ /
  Last update: 2014-06-20 20:21    [W:0.065 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site