[PATCH] drivers: staging: fbtft: fix checkpatch error and udelay

Ozgur Karatas okaratas at member.fsf.org
Mon Dec 19 17:44:42 UTC 2016


19.12.2016, 08:35, "Greg KH" <gregkh at linuxfoundation.org>:
> On Sun, Dec 18, 2016 at 11:47:30AM -0600, Scott Matheina wrote:
>>  These changes where identified by checkpatch.pl as needed changes to
>>  align the code with the linux development coding style. The several
>>  lines of text where aligned with the precending parenthesis.
>>
>>  Signed-off-by: Scott Matheina <scott at matheina.com>
>>
>>   Changes to be committed:
>>          modified: drivers/staging/fbtft/fb_agm1264k-fl.c
>
> Why are these lines in the changelog text?

I checked with checkpatch script to code and give a some errors.
So, the code have to "udelay(20)".

udelay(20);

I read to Documentation/timers/timers-howto.txt and
this line incorrect, usleep_range need must be add defined U_DELAY and fixed.

udelay(U_DELAY, U_DELAY + 10);

finally:

$ checkpatch.pl  drivers/staging/fbtft/fb_agm1264k-fl.c  | grep total
total: 0 errors

Signed-off-by: Ozgur Karatas <okaratas at member.fsf.org>

---
 drivers/staging/fbtft/fb_agm1264k-fl.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/fbtft/fb_agm1264k-fl.c b/drivers/staging/fbtft/fb_agm1264k-fl.c
index 7561385..2d46d03 100644
--- a/drivers/staging/fbtft/fb_agm1264k-fl.c
+++ b/drivers/staging/fbtft/fb_agm1264k-fl.c
@@ -36,10 +36,11 @@
 #define FPS			20
 
 #define EPIN		gpio.wr
-#define RS			gpio.dc
-#define RW			gpio.aux[2]
-#define CS0			gpio.aux[0]
-#define CS1			gpio.aux[1]
+#define RS		gpio.dc
+#define RW		gpio.aux[2]
+#define CS0		gpio.aux[0]
+#define CS1		gpio.aux[1]
+#define U_DELAY
 
 /* diffusing error (Floyd-Steinberg) */
 #define DIFFUSING_MATRIX_WIDTH	2
@@ -94,7 +95,7 @@ static void reset(struct fbtft_par *par)
 	dev_dbg(par->info->device, "%s()\n", __func__);
 
 	gpio_set_value(par->gpio.reset, 0);
-	udelay(20);
+	udelay(U_DELAY, U_DELAY + 10);
 	gpio_set_value(par->gpio.reset, 1);
 	mdelay(120);
 }
@@ -185,8 +186,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
 			buf[i] = (u8)va_arg(args, unsigned int);
 
 		va_end(args);
-		fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par,
-			par->info->device, u8, buf, len, "%s: ", __func__);
+		fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, u8, buf, len, "%s: ", __func__);
 	}
 
 	va_start(args, len);
@@ -245,8 +245,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
 }
 
 static void
-construct_line_bitmap(struct fbtft_par *par, u8 *dest, signed short *src,
-						int xs, int xe, int y)
+construct_line_bitmap(struct fbtft_par *par, u8 *dest, signed short *src, int xs, int xe, int y)
 {
 	int x, i;
 
@@ -326,9 +325,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 					signed char coeff;
 
 					/* skip pixels out of zone */
-					if (x + i < 0 ||
-						x + i >= par->info->var.xres
-						|| y + j >= par->info->var.yres)
+					if (x + i < 0 || x + i >= par->info->var.xres || y + j >= par->info->var.yres)
 						continue;
 					write_pos = &convert_buf[
 						(y + j) * par->info->var.xres +
@@ -354,8 +351,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 	for (y = addr_win.ys_page; y <= addr_win.ye_page; ++y) {
 		/* left half of display */
 		if (addr_win.xs < par->info->var.xres / 2) {
-			construct_line_bitmap(par, buf, convert_buf,
-				addr_win.xs, par->info->var.xres / 2, y);
+			construct_line_bitmap(par, buf, convert_buf, addr_win.xs, par->info->var.xres / 2, y);
 
 			len = par->info->var.xres / 2 - addr_win.xs;
 
@@ -375,9 +371,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 		}
 		/* right half of display */
 		if (addr_win.xe >= par->info->var.xres / 2) {
-			construct_line_bitmap(par, buf,
-				convert_buf, par->info->var.xres / 2,
-				addr_win.xe + 1, y);
+			construct_line_bitmap(par, buf, convert_buf, par->info->var.xres / 2, addr_win.xe + 1, y);
 
 			len = addr_win.xe + 1 - par->info->var.xres / 2;
 
@@ -406,8 +400,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 
 static int write(struct fbtft_par *par, void *buf, size_t len)
 {
-	fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len,
-		"%s(len=%d): ", __func__, len);
+	fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, "%s(len=%d): ", __func__, len);
 
 	gpio_set_value(par->RW, 0); /* set write mode */
 
-- 
2.1.4


More information about the devel mailing list