| Message ID | 01a401cf69ba$0f1b88d0$2d529a70$%han@samsung.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Wed, May 07, 2014 at 03:03:25PM +0900, Jingoo Han wrote: > The site-specific OOM messages are unnecessary, because they > duplicate the MM subsystem generic OOM message. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/thermal/rcar_thermal.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c > index 5a37940..105ab5e 100644 > --- a/drivers/thermal/rcar_thermal.c > +++ b/drivers/thermal/rcar_thermal.c > @@ -374,10 +374,8 @@ static int rcar_thermal_probe(struct platform_device *pdev) > int idle = IDLE_INTERVAL; > > common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); > - if (!common) { > - dev_err(dev, "Could not allocate common\n"); > + if (!common) > return -ENOMEM; > - } > > INIT_LIST_HEAD(&common->head); > spin_lock_init(&common->lock); > @@ -423,7 +421,6 @@ static int rcar_thermal_probe(struct platform_device *pdev) > > priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > if (!priv) { > - dev_err(dev, "Could not allocate priv\n"); > ret = -ENOMEM; > goto error_unregister; > } > -- > 1.7.10.4 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 5a37940..105ab5e 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -374,10 +374,8 @@ static int rcar_thermal_probe(struct platform_device *pdev) int idle = IDLE_INTERVAL; common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); - if (!common) { - dev_err(dev, "Could not allocate common\n"); + if (!common) return -ENOMEM; - } INIT_LIST_HEAD(&common->head); spin_lock_init(&common->lock); @@ -423,7 +421,6 @@ static int rcar_thermal_probe(struct platform_device *pdev) priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) { - dev_err(dev, "Could not allocate priv\n"); ret = -ENOMEM; goto error_unregister; }
The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> --- drivers/thermal/rcar_thermal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)