* Re: [PATCH 2/2] devfreq: separate error paths from successful path
@ 2011-11-11 4:09 MyungJoo Ham
2011-11-14 23:17 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: MyungJoo Ham @ 2011-11-11 4:09 UTC (permalink / raw)
To: Axel Lin, linux-kernel
Cc: Kevin Hilman, 박경민,
Mike Turquette, Rafael J. Wysocki
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 1622 bytes --]
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>
> ---
> 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);
> }
>
> /**
> --
> 1.7.5.4
>
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] devfreq: separate error paths from successful path
2011-11-11 4:09 [PATCH 2/2] devfreq: separate error paths from successful path MyungJoo Ham
@ 2011-11-14 23:17 ` Rafael J. Wysocki
2011-11-14 23:19 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2011-11-14 23:17 UTC (permalink / raw)
To: myungjoo.ham
Cc: Axel Lin, linux-kernel, Kevin Hilman, 박경민,
Mike Turquette
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.
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);
> > }
> >
> > /**
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] devfreq: separate error paths from successful path
2011-11-14 23:17 ` Rafael J. Wysocki
@ 2011-11-14 23:19 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2011-11-14 23:19 UTC (permalink / raw)
To: myungjoo.ham
Cc: Axel Lin, linux-kernel, Kevin Hilman, 박경민,
Mike Turquette
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/
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] devfreq: separate error paths from successful path
2011-11-10 7:28 [PATCH 1/2] devfreq: fix use after free in devfreq_remove_device Axel Lin
@ 2011-11-10 7:30 ` Axel Lin
0 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2011-11-10 7:30 UTC (permalink / raw)
To: linux-kernel
Cc: MyungJoo Ham, Kevin Hilman, Kyungmin Park, Mike Turquette,
Rafael J. Wysocki
I think this change improves readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
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.\n", __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\n",
__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);
}
/**
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-14 23:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-11 4:09 [PATCH 2/2] devfreq: separate error paths from successful path MyungJoo Ham
2011-11-14 23:17 ` Rafael J. Wysocki
2011-11-14 23:19 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2011-11-10 7:28 [PATCH 1/2] devfreq: fix use after free in devfreq_remove_device Axel Lin
2011-11-10 7:30 ` [PATCH 2/2] devfreq: separate error paths from successful path Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).