Staging: fbtbt: Fix code style issues

PATCH In review Vatika Harlalka 3 participants 5 messages Mar 12, 2015 – Mar 15, 2015

Subsystems (2)

Staging Fbtft Framebuffer drivers

lore

Share & tools

lore

Vatika Harlalka

author

2015-03-12 14:34 UTC #0 lore raw

PATCH 1/1 Staging: fbtbt: Fix code style issues

Reduce line size to increase readability and
remove unnecessary brackets.

Signed-off-by Vatika Harlalka <[email protected]>

---
 drivers/staging/fbtft/fb_ra8875.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

drivers/staging/fbtft/fb_ra8875.c +12 -7

index e21af6c..14e8cf0 100644
@@ -72,12 +72,13 @@ static int init_display(struct fbtft_par *par)
 
 	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
 		"%s()\n", __func__);
-	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
-		"display size %dx%d\n", par->info->var.xres, par->info->var.yres);
+	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "display size %dx%d\n",
+			par->info->var.xres, par->info->var.yres);
 
 	par->fbtftops.reset(par);
 
-	if ((par->info->var.xres == 320) && (par->info->var.yres == 240)) {
+	if (par->info->var.xres == 320 &&
+		par->info->var.yres == 240) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0A);
 		write_reg(par, 0x89, 0x02);

@@ -101,7 +102,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x0E);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x02);
-	} else if ((par->info->var.xres == 480) && (par->info->var.yres == 272)) {
+	} else if (par->info->var.xres == 480 && 
+			par->info->var.yres == 272) {
 		/* PLL clock frequency  */
 		write_reg(par, 0x88, 0x0A);
 		write_reg(par, 0x89, 0x02);

@@ -125,7 +127,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x07);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x09);
-	} else if ((par->info->var.xres == 640) && (par->info->var.yres == 480)) {
+	} else if (par->info->var.xres == 640 &&
+			par->info->var.yres == 480) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0B);
 		write_reg(par, 0x89, 0x02);

@@ -149,7 +152,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x0E);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x01);
-	} else if ((par->info->var.xres == 800) && (par->info->var.yres == 480)) {
+	} else if (par->info->var.xres == 800 &&
+			par->info->var.yres == 480) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0B);
 		write_reg(par, 0x89, 0x02);

@@ -174,7 +178,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x01);
 	} else {
-		dev_err(par->info->device, "display size is not supported!!");
+		dev_err(par->info->device,
+			"display size is not supported!!");
 		return -1;
 	}

Signature · 1 line

1.9.1

Julia Lawall

2015-03-12 20:14 UTC #1 lore raw

Quoted 13 lines · Vatika Harlalka

Reduce line size to increase readability and
remove unnecessary brackets.
Signed-off-by Vatika Harlalka <[email protected]>
---
 drivers/staging/fbtft/fb_ra8875.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/staging/fbtft/fb_ra8875.c +0 -0
index e21af6c..14e8cf0 100644

drivers/staging/fbtft/fb_ra8875.c static int init_display(struct fbtft_par *par) · line 76

Quoted 7 lines

drivers/staging/fbtft/fb_ra8875.c +2 -2

@@ -72,12 +72,13 @@ static int init_display(struct fbtft_par *par)
 
 	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
 		"%s()\n", __func__);
-	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
-		"display size %dx%d\n", par->info->var.xres, par->info->var.yres);
+	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "display size %dx%d\n",
+			par->info->var.xres, par->info->var.yres);

Is there a more standard printing function that you can use here (in another patch)?

julia

Quoted 59 lines

drivers/staging/fbtft/fb_ra8875.c +10 -5

 	par->fbtftops.reset(par);
 
-	if ((par->info->var.xres == 320) && (par->info->var.yres == 240)) {
+	if (par->info->var.xres == 320 &&
+		par->info->var.yres == 240) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0A);
 		write_reg(par, 0x89, 0x02);

@@ -101,7 +102,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x0E);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x02);
-	} else if ((par->info->var.xres == 480) && (par->info->var.yres == 272)) {
+	} else if (par->info->var.xres == 480 && 
+			par->info->var.yres == 272) {
 		/* PLL clock frequency  */
 		write_reg(par, 0x88, 0x0A);
 		write_reg(par, 0x89, 0x02);

@@ -125,7 +127,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x07);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x09);
-	} else if ((par->info->var.xres == 640) && (par->info->var.yres == 480)) {
+	} else if (par->info->var.xres == 640 &&
+			par->info->var.yres == 480) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0B);
 		write_reg(par, 0x89, 0x02);

@@ -149,7 +152,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1D, 0x0E);
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x01);
-	} else if ((par->info->var.xres == 800) && (par->info->var.yres == 480)) {
+	} else if (par->info->var.xres == 800 &&
+			par->info->var.yres == 480) {
 		/* PLL clock frequency */
 		write_reg(par, 0x88, 0x0B);
 		write_reg(par, 0x89, 0x02);

@@ -174,7 +178,8 @@ static int init_display(struct fbtft_par *par)
 		write_reg(par, 0x1E, 0x00);
 		write_reg(par, 0x1F, 0x01);
 	} else {
-		dev_err(par->info->device, "display size is not supported!!");
+		dev_err(par->info->device,
+			"display size is not supported!!");
 		return -1;
 	}

Signature · 8 lines

1.9.1

-- 
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20150312143226.GA26267%40akanksha.
For more options, visit https://groups.google.com/d/optout.

The definition of fbtft_par_dbg uses a call to dev_info after rearranging the parameters appropriately. This is done after checking:
if (unlikely(par->debug & level))
ie the expected value of par->debug &level is 0. Could you please provide some guidance on what other function I should use?

Thanks!

Julia Lawall

2015-03-12 22:00 UTC #3 lore raw

Quoted 7 lines · Vatika Harlalka

The definition of fbtft_par_dbg uses a call to dev_info after rearranging the parameters appropriately. This is done after checking:
if (unlikely(par->debug & level))
ie the expected value of par->debug &level is 0. Could you please provide some guidance on what other function I should use?

I'm not sure any more what file your patch was in, but I looked at some other files in this directory, and it seems that many uses of this function are at the beginning of a function. That is, they just indicate what the driver is doing, but not any abnormal condition. Perhaps they could just be dropped. For the ones that seem very useful, you could use dev_info.

julia

Greg KH

maintainer

2015-03-15 10:47 UTC #4 lore raw

In reply to Vatika Harlalka

Quoted 2 lines · Vatika Harlalka

Reduce line size to increase readability and
remove unnecessary brackets.

Again, your subject: needs work...