2013-04-10 21:05:41

by Silviu-Mihai Popescu

[permalink] [raw]
Subject: [PATCH] drivers: usb: chipidea: convert to devm_ioremap_resource()

Convert use of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Silviu-Mihai Popescu <[email protected]>
---
drivers/usb/chipidea/core.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 57cae1f..7f3a9e1 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -410,11 +410,9 @@ static int ci_hdrc_probe(struct platform_device *pdev)
return -ENODEV;
}

- base = devm_request_and_ioremap(dev, res);
- if (!base) {
- dev_err(dev, "can't request and ioremap resource\n");
- return -ENOMEM;
- }
+ base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);

ci = devm_kzalloc(dev, sizeof(*ci), GFP_KERNEL);
if (!ci) {
--
1.7.9.5


2013-04-11 07:10:55

by Alexander Shishkin

[permalink] [raw]
Subject: Re: [PATCH] drivers: usb: chipidea: convert to devm_ioremap_resource()

Silviu-Mihai Popescu <[email protected]> writes:

> Convert use of devm_request_and_ioremap() to the newly introduced
> devm_ioremap_resource() which provides more consistent error handling.

You mean, you've run coccinelle? Remember to mention it, then.

> devm_ioremap_resource() provides its own error messages so all explicit
> error messages can be removed from the failure code paths.
>
> Signed-off-by: Silviu-Mihai Popescu <[email protected]>

That's cool, but your chipidea patches have to be based off of
ci-for-greg branch of the chipidea tree [1] or at least usb-next branch
of Greg's usb.git [2].

[1] git://github.com/virtuoso/linux-ci.git
[2] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

Regards,
--
Alex

2013-04-11 07:21:12

by Silviu-Mihai Popescu

[permalink] [raw]
Subject: Re: [PATCH] drivers: usb: chipidea: convert to devm_ioremap_resource()

On Thu, Apr 11, 2013 at 10:12 AM, Alexander Shishkin
<[email protected]> wrote:
> That's cool, but your chipidea patches have to be based off of
> ci-for-greg branch of the chipidea tree [1] or at least usb-next branch
> of Greg's usb.git [2].
>
> [1] git://github.com/virtuoso/linux-ci.git
> [2] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

Thanks for the tip. I see that both trees use devm_ioremap_resource().
I'll remember to check them next time I have a patch.

--
Silviu