Re: [PATCH 2/2] devfreq: separate error paths from successful path

From: Rafael J. Wysocki
Date: Mon Nov 14 2011 - 18:15:01 EST


On Friday, November 11, 2011, MyungJoo Ham wrote:
> Sender : Axel Lin<axel.lin@xxxxxxxxx> Date : 2011-11-10 16:30 (GMT+09:00)
> > I think this change improves readability.
> >
> > Signed-off-by: Axel Lin
>
> I agree. It makes it easier to read.
>
> Acked-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>

Applied to linux-pm/pm-fixes.

Thanks,
Rafael


> > ---
> > drivers/devfreq/devfreq.c | 15 +++++++--------
> > 1 files changed, 7 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> > index 59d24e9..c189b82 100644
> > --- a/drivers/devfreq/devfreq.c
> > +++ b/drivers/devfreq/devfreq.c
> > @@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
> > if (!IS_ERR(devfreq)) {
> > dev_err(dev, "%s: Unable to create devfreq for the device. It already has one. ", __func__);
> > err = -EINVAL;
> > - goto out;
> > + goto err_out;
> > }
> > }
> >
> > @@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
> > dev_err(dev, "%s: Unable to create devfreq for the device ",
> > __func__);
> > err = -ENOMEM;
> > - goto out;
> > + goto err_out;
> > }
> >
> > mutex_init(&devfreq->lock);
> > @@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
> > devfreq->next_polling);
> > }
> > mutex_unlock(&devfreq_list_lock);
> > - goto out;
> > +out:
> > + return devfreq;
> > +
> > err_init:
> > device_unregister(&devfreq->dev);
> > err_dev:
> > mutex_unlock(&devfreq->lock);
> > kfree(devfreq);
> > -out:
> > - if (err)
> > - return ERR_PTR(err);
> > - else
> > - return devfreq;
> > +err_out:
> > + return ERR_PTR(err);
> > }
> >
> > /**
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/