lkml.org 
[lkml]   [2013]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 11/15] regulator: ti-abb: Convert to use devm_ioremap_resource
On 06/10/2013 05:31 PM, Sachin Kamat wrote:
> On 10 June 2013 17:05, Tushar Behera <tushar.behera@linaro.org> wrote:
>> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
>> introduced devm_ioremap_resource() and deprecated the use of
>> devm_request_and_ioremap().
>>
>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>> CC: Mark Brown <broonie@kernel.org>
>> CC: Liam Girdwood <lgirdwood@gmail.com>
>> ---
>> drivers/regulator/ti-abb-regulator.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
>> index 870d209..f494a11 100644
>> --- a/drivers/regulator/ti-abb-regulator.c
>> +++ b/drivers/regulator/ti-abb-regulator.c
>> @@ -722,10 +722,10 @@ static int ti_abb_probe(struct platform_device *pdev)
>> ret = -ENODEV;
>> goto err;
>> }
>> - abb->base = devm_request_and_ioremap(dev, res);
>> - if (!abb->base) {
>> + abb->base = devm_ioremap_resource(dev, res);
>> + if (IS_ERR(abb->base)) {
>> dev_err(dev, "Unable to map '%s'\n", pname);
>
> You may remove the above error message as devm_ioremap_resource prints
> its own error messages.
>

There are a few other error messages in the driver (related to
devm_ioremap_nocache) in the same format. I would prefer to leave this
error message right now.

>> - ret = -ENOMEM;
>> + ret = PTR_ERR(abb->base);
>> goto err;
>> }
>>
>> @@ -776,10 +776,10 @@ static int ti_abb_probe(struct platform_device *pdev)
>> ret = -ENODEV;
>> goto skip_opt;
>> }
>> - abb->ldo_base = devm_request_and_ioremap(dev, res);
>> - if (!abb->ldo_base) {
>> + abb->ldo_base = devm_ioremap_resource(dev, res);
>> + if (IS_ERR(abb->ldo_base)) {
>> dev_err(dev, "Unable to map '%s'\n", pname);
>
> ditto
>

Same as above.

Thanks.

--
Tushar Behera


\
 
 \ /
  Last update: 2013-06-11 07:01    [W:0.188 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site