aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-04-26 06:24:18 -0400
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-04-26 06:24:18 -0400
commite0e894f5941871a08cddeda0ad6996c82613d0a7 (patch)
treea91fe756aaf42fadc91ffa5ee9e75ed05da19be9
parentc24a5e934775865270b1a79a95affadb4289b3d3 (diff)
video: fbdev-MMP: Delete an error message for a failed memory allocation in two 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r--drivers/video/fbdev/mmp/fb/mmpfb.c5
-rw-r--r--drivers/video/fbdev/mmp/hw/mmp_ctrl.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/video/fbdev/mmp/fb/mmpfb.c b/drivers/video/fbdev/mmp/fb/mmpfb.c
index 92279e02dd94..292b3e403044 100644
--- a/drivers/video/fbdev/mmp/fb/mmpfb.c
+++ b/drivers/video/fbdev/mmp/fb/mmpfb.c
@@ -495,10 +495,9 @@ static int modes_setup(struct mmpfb_info *fbi)
495 /* put videomode list to info structure */ 495 /* put videomode list to info structure */
496 videomodes = kzalloc(sizeof(struct fb_videomode) * videomode_num, 496 videomodes = kzalloc(sizeof(struct fb_videomode) * videomode_num,
497 GFP_KERNEL); 497 GFP_KERNEL);
498 if (!videomodes) { 498 if (!videomodes)
499 dev_err(fbi->dev, "can't malloc video modes\n");
500 return -ENOMEM; 499 return -ENOMEM;
501 } 500
502 for (i = 0; i < videomode_num; i++) 501 for (i = 0; i < videomode_num; i++)
503 mmpmode_to_fbmode(&videomodes[i], &mmp_modes[i]); 502 mmpmode_to_fbmode(&videomodes[i], &mmp_modes[i]);
504 fb_videomode_to_modelist(videomodes, videomode_num, &info->modelist); 503 fb_videomode_to_modelist(videomodes, videomode_num, &info->modelist);
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index b6f83d5df9fd..9f912ea0bfce 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -407,11 +407,9 @@ static int path_init(struct mmphw_path_plat *path_plat,
407 407
408 /* init driver data */ 408 /* init driver data */
409 path_info = kzalloc(sizeof(struct mmp_path_info), GFP_KERNEL); 409 path_info = kzalloc(sizeof(struct mmp_path_info), GFP_KERNEL);
410 if (!path_info) { 410 if (!path_info)
411 dev_err(ctrl->dev, "%s: unable to alloc path_info for %s\n",
412 __func__, config->name);
413 return 0; 411 return 0;
414 } 412
415 path_info->name = config->name; 413 path_info->name = config->name;
416 path_info->id = path_plat->id; 414 path_info->id = path_plat->id;
417 path_info->dev = ctrl->dev; 415 path_info->dev = ctrl->dev;