Skip to contentSkip to conversation

staging: fbtft: fb_ssd1331: Use common error handling code in write_reg8_bus8()

PATCH New SF Markus Elfring 1 participant 1 message Nov 2, 2017

Subsystems (3)
Staging Kernel janitors Fbtft Framebuffer drivers
lore
Share & tools
lore

SF Markus Elfring

author
#0 lore raw

PATCH 1/1 staging: fbtft: fb_ssd1331: Use common error handling code in write_reg8_bus8()

From: Markus Elfring <[email protected]>
Date: Thu, 2 Nov 2017 22:27:13 +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 <[email protected]>
---
 drivers/staging/fbtft/fb_ssd1331.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/staging/fbtft/fb_ssd1331.c +10 -12
index 9aa9864fcf30..b3a8f2668951 100644
@@ -76,12 +76,9 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
 	if (par->gpio.dc != -1)
 		gpio_set_value(par->gpio.dc, 0);
 	ret = par->fbtftops.write(par, par->buf, sizeof(u8));
-	if (ret < 0) {
-		va_end(args);
-		dev_err(par->info->device,
-			"write() failed and returned %d\n", ret);
-		return;
-	}
+	if (ret < 0)
+		goto end_va;
+
 	len--;
 
 	if (len) {

@@ -89,16 +86,17 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
 		while (i--)
 			*buf++ = (u8)va_arg(args, unsigned int);
 		ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));
-		if (ret < 0) {
-			va_end(args);
-			dev_err(par->info->device,
-				"write() failed and returned %d\n", ret);
-			return;
-		}
+		if (ret < 0)
+			goto end_va;
 	}
 	if (par->gpio.dc != -1)
 		gpio_set_value(par->gpio.dc, 1);
 	va_end(args);
+	return;
+
+end_va:
+	va_end(args);
+	dev_err(par->info->device, "write() failed and returned %d\n", ret);
 }
 
 /*
Signature · 1 line
2.15.0