Skip to content

Commit

Permalink
drm/tilcdc: Delete an error message for a failed memory allocation in…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Markus Elfring authored and Jyri Sarha committed Feb 28, 2018
1 parent 8bb5b22 commit 3366ba3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 19 deletions.
4 changes: 1 addition & 3 deletions drivers/gpu/drm/tilcdc/tilcdc_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -994,10 +994,8 @@ int tilcdc_crtc_create(struct drm_device *dev)
int ret;

tilcdc_crtc = devm_kzalloc(dev->dev, sizeof(*tilcdc_crtc), GFP_KERNEL);
if (!tilcdc_crtc) {
dev_err(dev->dev, "allocation failed\n");
if (!tilcdc_crtc)
return -ENOMEM;
}

init_completion(&tilcdc_crtc->palette_loaded);
tilcdc_crtc->palette_base = dmam_alloc_coherent(dev->dev,
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/tilcdc/tilcdc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,8 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev)
int ret;

priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) {
dev_err(dev, "failed to allocate private data\n");
if (!priv)
return -ENOMEM;
}

ddev = drm_dev_alloc(ddrv, dev);
if (IS_ERR(ddev))
Expand Down
9 changes: 2 additions & 7 deletions drivers/gpu/drm/tilcdc/tilcdc_panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ static struct drm_encoder *panel_encoder_create(struct drm_device *dev,

panel_encoder = devm_kzalloc(dev->dev, sizeof(*panel_encoder),
GFP_KERNEL);
if (!panel_encoder) {
dev_err(dev->dev, "allocation failed\n");
if (!panel_encoder)
return NULL;
}

panel_encoder->mod = mod;

Expand Down Expand Up @@ -210,10 +208,8 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,

panel_connector = devm_kzalloc(dev->dev, sizeof(*panel_connector),
GFP_KERNEL);
if (!panel_connector) {
dev_err(dev->dev, "allocation failed\n");
if (!panel_connector)
return NULL;
}

panel_connector->encoder = encoder;
panel_connector->mod = mod;
Expand Down Expand Up @@ -294,7 +290,6 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)

info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) {
pr_err("%s: allocation failed\n", __func__);
of_node_put(info_np);
return NULL;
}
Expand Down
8 changes: 2 additions & 6 deletions drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ static struct drm_encoder *tfp410_encoder_create(struct drm_device *dev,

tfp410_encoder = devm_kzalloc(dev->dev, sizeof(*tfp410_encoder),
GFP_KERNEL);
if (!tfp410_encoder) {
dev_err(dev->dev, "allocation failed\n");
if (!tfp410_encoder)
return NULL;
}

tfp410_encoder->dpms = DRM_MODE_DPMS_OFF;
tfp410_encoder->mod = mod;
Expand Down Expand Up @@ -224,10 +222,8 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,

tfp410_connector = devm_kzalloc(dev->dev, sizeof(*tfp410_connector),
GFP_KERNEL);
if (!tfp410_connector) {
dev_err(dev->dev, "allocation failed\n");
if (!tfp410_connector)
return NULL;
}

tfp410_connector->encoder = encoder;
tfp410_connector->mod = mod;
Expand Down

0 comments on commit 3366ba3

Please sign in to comment.