lkml.org 
[lkml]   [2013]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 11/15] regulator: ti-abb: Convert to use devm_ioremap_resource
    From
    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.

    > - 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

    > - ret = -ENOMEM;
    > + ret = PTR_ERR(abb->ldo_base);
    > goto err;
    > }
    >
    > --
    > 1.7.9.5
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/



    --
    With warm regards,
    Sachin


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