Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH 2/2] devfreq: separate error paths from successful path | Date | Tue, 15 Nov 2011 00:19:59 +0100 |
| |
On Tuesday, November 15, 2011, Rafael J. Wysocki wrote: > On Friday, November 11, 2011, MyungJoo Ham wrote: > > Sender : Axel Lin<axel.lin@gmail.com> 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@samsung.com> > > Applied to linux-pm/pm-fixes.
Sorry, this one went to linux-pm/linux-next and will wait for the 3.3 merge window.
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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > >
| |