Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36fa82a6 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: sm7xxfb: reduce indention 



reduce code indention keeping the logic same.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5daff3f

drivers/staging/sm7xxfb/sm7xxfb.c

+82 −91
Original line number Diff line number Diff line
@@ -255,17 +255,16 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green, 
		/*

		 * 16/32 bit true-colour, use pseudo-palette for 16 base color

		 */

		if (regno < 16) {

		if (regno >= 16)

			break;

		if (sfb->fb->var.bits_per_pixel == 16) {

			u32 *pal = sfb->fb->pseudo_palette;



			val = chan_to_field(red, &sfb->fb->var.red);

				val |= chan_to_field(green,

						     &sfb->fb->var.green);

			val |= chan_to_field(green, &sfb->fb->var.green);

			val |= chan_to_field(blue, &sfb->fb->var.blue);

#ifdef __BIG_ENDIAN

				pal[regno] =

				    ((red & 0xf800) >> 8) |

			pal[regno] = ((red & 0xf800) >> 8) |

				     ((green & 0xe000) >> 13) |

				     ((green & 0x1c00) << 3) |

				     ((blue & 0xf800) >> 3);
@@ -276,17 +275,14 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green, 
			u32 *pal = sfb->fb->pseudo_palette;



			val = chan_to_field(red, &sfb->fb->var.red);

				val |= chan_to_field(green,

						     &sfb->fb->var.green);

			val |= chan_to_field(green, &sfb->fb->var.green);

			val |= chan_to_field(blue, &sfb->fb->var.blue);

#ifdef __BIG_ENDIAN

				val =

				    (val & 0xff00ff00 >> 8) |

			val = (val & 0xff00ff00 >> 8) |

			      (val & 0x00ff00ff << 8);

#endif

			pal[regno] = val;

		}

		}

		break;



	case FB_VISUAL_PSEUDOCOLOR:
@@ -476,10 +472,12 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb) 
		sfb->width, sfb->height, sfb->fb->var.bits_per_pixel, sfb->hz);



	for (j = 0; j < ARRAY_SIZE(vgamode); j++) {

		if (vgamode[j].mmsizex == sfb->width &&

		    vgamode[j].mmsizey == sfb->height &&

		    vgamode[j].bpp == sfb->fb->var.bits_per_pixel &&

		    vgamode[j].hz == sfb->hz) {

		if (vgamode[j].mmsizex != sfb->width ||

		    vgamode[j].mmsizey != sfb->height ||

		    vgamode[j].bpp != sfb->fb->var.bits_per_pixel ||

		    vgamode[j].hz != sfb->hz)

			continue;



		dev_dbg(&sfb->pdev->dev,

			"vgamode[j].mmsizex=%d vgamode[j].mmSizeY=%d vgamode[j].bpp=%d vgamode[j].hz=%d\n",

			vgamode[j].mmsizex, vgamode[j].mmsizey,
@@ -499,26 +497,22 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb) 


		/* init SEQ register SR10 - SR24 */

		for (i = 0; i < SIZE_SR10_SR24; i++)

				smtc_seqw(i + 0x10,

					  vgamode[j].init_sr10_sr24[i]);

			smtc_seqw(i + 0x10, vgamode[j].init_sr10_sr24[i]);



		/* init SEQ register SR30 - SR75 */

		for (i = 0; i < SIZE_SR30_SR75; i++)

				if ((i + 0x30) != 0x62 &&

				    (i + 0x30) != 0x6a &&

			if ((i + 0x30) != 0x62 && (i + 0x30) != 0x6a &&

			    (i + 0x30) != 0x6b)

				smtc_seqw(i + 0x30,

					  vgamode[j].init_sr30_sr75[i]);



		/* init SEQ register SR80 - SR93 */

		for (i = 0; i < SIZE_SR80_SR93; i++)

				smtc_seqw(i + 0x80,

					  vgamode[j].init_sr80_sr93[i]);

			smtc_seqw(i + 0x80, vgamode[j].init_sr80_sr93[i]);



		/* init SEQ register SRA0 - SRAF */

		for (i = 0; i < SIZE_SRA0_SRAF; i++)

				smtc_seqw(i + 0xa0,

					  vgamode[j].init_sra0_sraf[i]);

			smtc_seqw(i + 0xa0, vgamode[j].init_sra0_sraf[i]);



		/* init Graphic register GR00 - GR08 */

		for (i = 0; i < SIZE_GR00_GR08; i++)
@@ -534,14 +528,11 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb) 


		/* init CRTC register CR30 - CR4D */

		for (i = 0; i < SIZE_CR30_CR4D; i++)

				smtc_crtcw(i + 0x30,

					   vgamode[j].init_cr30_cr4d[i]);

			smtc_crtcw(i + 0x30, vgamode[j].init_cr30_cr4d[i]);



		/* init CRTC register CR90 - CRA7 */

		for (i = 0; i < SIZE_CR90_CRA7; i++)

				smtc_crtcw(i + 0x90,

					   vgamode[j].init_cr90_cra7[i]);

		}

			smtc_crtcw(i + 0x90, vgamode[j].init_cr90_cra7[i]);

	}

	smtc_mmiowb(0x67, 0x3c2);