From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 05 Nov 2017 13:10:29 +0000 Subject: [PATCH] video: atmel_lcdfb: Use common error handling code in atmel_lcdfb_of_init() Message-Id: <2db677d2-ad4e-1f79-344b-dfa38ce948c9@users.sourceforge.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz , Nicolas Ferre Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Sun, 5 Nov 2017 14:00:52 +0100 Add a jump target so that a specific error message is stored only once at the end of this function implementation. Replace two calls of the function "dev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/video/fbdev/atmel_lcdfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c index e06358da4b99..3672c2e52ebd 100644 --- a/drivers/video/fbdev/atmel_lcdfb.c +++ b/drivers/video/fbdev/atmel_lcdfb.c @@ -1047,10 +1047,8 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) } ret = of_property_read_u32(display_np, "bits-per-pixel", &var->bits_per_pixel); - if (ret < 0) { - dev_err(dev, "failed to get property bits-per-pixel\n"); - goto put_display_node; - } + if (ret < 0) + goto report_bits_failure; ret = of_property_read_u32(display_np, "atmel,guard-time", &pdata->guard_time); if (ret < 0) { @@ -1065,10 +1063,8 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) } ret = of_property_read_u32(display_np, "atmel,dmacon", &pdata->default_dmacon); - if (ret < 0) { - dev_err(dev, "failed to get property bits-per-pixel\n"); - goto put_display_node; - } + if (ret < 0) + goto report_bits_failure; INIT_LIST_HEAD(&pdata->pwr_gpios); ret = -ENOMEM; @@ -1147,6 +1143,10 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) put_display_node: of_node_put(display_np); return ret; + +report_bits_failure: + dev_err(dev, "failed to get property bits-per-pixel\n"); + goto put_display_node; } #else static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) -- 2.15.0