| From af1ca0e6267d457c67852835dfd589e5c4470970 Mon Sep 17 00:00:00 2001 |
| From: Jingoo Han <jg1.han@samsung.com> |
| Date: Wed, 7 May 2014 15:03:25 +0900 |
| Subject: thermal: rcar: remove unnecessary OOM messages |
| |
| 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> |
| Signed-off-by: Zhang Rui <rui.zhang@intel.com> |
| (cherry picked from commit b0a60d88d60b92c769ec589796403937f6e5243e) |
| Signed-off-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 a8ed0e0265ae..8803e693fe68 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; |
| } |
| -- |
| 2.1.2 |
| |
