aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-02-06 15:51:15 -0500
committerJyri Sarha <jsarha@ti.com>2018-02-28 04:25:35 -0500
commit3366ba38cad887e587b28b7ab83a01e1c59a8466 (patch)
tree2b70107b8baa0aa477c8b7673f1ff6407ba4f9d6 /drivers/gpu
parent8bb5b22255dac09cd74eae9f86333b474d69fbbe (diff)
drm/tilcdc: Delete an error message for a failed memory allocation in seven functions
Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Jyri Sarha <jsarha@ti.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c4
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_drv.c4
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_panel.c9
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_tfp410.c8
4 files changed, 6 insertions, 19 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 8bf6bb93dc79..1b278a22c8b7 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -994,10 +994,8 @@ int tilcdc_crtc_create(struct drm_device *dev)
994 int ret; 994 int ret;
995 995
996 tilcdc_crtc = devm_kzalloc(dev->dev, sizeof(*tilcdc_crtc), GFP_KERNEL); 996 tilcdc_crtc = devm_kzalloc(dev->dev, sizeof(*tilcdc_crtc), GFP_KERNEL);
997 if (!tilcdc_crtc) { 997 if (!tilcdc_crtc)
998 dev_err(dev->dev, "allocation failed\n");
999 return -ENOMEM; 998 return -ENOMEM;
1000 }
1001 999
1002 init_completion(&tilcdc_crtc->palette_loaded); 1000 init_completion(&tilcdc_crtc->palette_loaded);
1003 tilcdc_crtc->palette_base = dmam_alloc_coherent(dev->dev, 1001 tilcdc_crtc->palette_base = dmam_alloc_coherent(dev->dev,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 1afde61f1247..b8a5e4ed22e6 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -233,10 +233,8 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev)
233 int ret; 233 int ret;
234 234
235 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); 235 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
236 if (!priv) { 236 if (!priv)
237 dev_err(dev, "failed to allocate private data\n");
238 return -ENOMEM; 237 return -ENOMEM;
239 }
240 238
241 ddev = drm_dev_alloc(ddrv, dev); 239 ddev = drm_dev_alloc(ddrv, dev);
242 if (IS_ERR(ddev)) 240 if (IS_ERR(ddev))
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 8eebb5f826a6..0b6aa95aec89 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -101,10 +101,8 @@ static struct drm_encoder *panel_encoder_create(struct drm_device *dev,
101 101
102 panel_encoder = devm_kzalloc(dev->dev, sizeof(*panel_encoder), 102 panel_encoder = devm_kzalloc(dev->dev, sizeof(*panel_encoder),
103 GFP_KERNEL); 103 GFP_KERNEL);
104 if (!panel_encoder) { 104 if (!panel_encoder)
105 dev_err(dev->dev, "allocation failed\n");
106 return NULL; 105 return NULL;
107 }
108 106
109 panel_encoder->mod = mod; 107 panel_encoder->mod = mod;
110 108
@@ -210,10 +208,8 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
210 208
211 panel_connector = devm_kzalloc(dev->dev, sizeof(*panel_connector), 209 panel_connector = devm_kzalloc(dev->dev, sizeof(*panel_connector),
212 GFP_KERNEL); 210 GFP_KERNEL);
213 if (!panel_connector) { 211 if (!panel_connector)
214 dev_err(dev->dev, "allocation failed\n");
215 return NULL; 212 return NULL;
216 }
217 213
218 panel_connector->encoder = encoder; 214 panel_connector->encoder = encoder;
219 panel_connector->mod = mod; 215 panel_connector->mod = mod;
@@ -294,7 +290,6 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)
294 290
295 info = kzalloc(sizeof(*info), GFP_KERNEL); 291 info = kzalloc(sizeof(*info), GFP_KERNEL);
296 if (!info) { 292 if (!info) {
297 pr_err("%s: allocation failed\n", __func__);
298 of_node_put(info_np); 293 of_node_put(info_np);
299 return NULL; 294 return NULL;
300 } 295 }
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 7e3643462a08..c45cabb38db0 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -111,10 +111,8 @@ static struct drm_encoder *tfp410_encoder_create(struct drm_device *dev,
111 111
112 tfp410_encoder = devm_kzalloc(dev->dev, sizeof(*tfp410_encoder), 112 tfp410_encoder = devm_kzalloc(dev->dev, sizeof(*tfp410_encoder),
113 GFP_KERNEL); 113 GFP_KERNEL);
114 if (!tfp410_encoder) { 114 if (!tfp410_encoder)
115 dev_err(dev->dev, "allocation failed\n");
116 return NULL; 115 return NULL;
117 }
118 116
119 tfp410_encoder->dpms = DRM_MODE_DPMS_OFF; 117 tfp410_encoder->dpms = DRM_MODE_DPMS_OFF;
120 tfp410_encoder->mod = mod; 118 tfp410_encoder->mod = mod;
@@ -224,10 +222,8 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
224 222
225 tfp410_connector = devm_kzalloc(dev->dev, sizeof(*tfp410_connector), 223 tfp410_connector = devm_kzalloc(dev->dev, sizeof(*tfp410_connector),
226 GFP_KERNEL); 224 GFP_KERNEL);
227 if (!tfp410_connector) { 225 if (!tfp410_connector)
228 dev_err(dev->dev, "allocation failed\n");
229 return NULL; 226 return NULL;
230 }
231 227
232 tfp410_connector->encoder = encoder; 228 tfp410_connector->encoder = encoder;
233 tfp410_connector->mod = mod; 229 tfp410_connector->mod = mod;