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

Commit d3e329b3 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: sis: fix duplicated code for different branches 



Refactor code in order to avoid identical code for different branches.

This issue was detected with the help of Coccinelle.

Addresses-Coverity-ID: 1226761
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent a7582733

drivers/video/fbdev/sis/init301.c

+3 −12
Original line number Diff line number Diff line
@@ -6848,8 +6848,6 @@ SiS_SetGroup2(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short 
	   if(SiS_Pr->SiS_VGAHDE >= 1280) {

              tempch = 20;

              tempbx &= ~0x20;

           } else if(SiS_Pr->SiS_VGAHDE >= 1024) {

              tempch = 25;

           } else {

	      tempch = 25; /* OK */

	   }
@@ -7965,14 +7963,9 @@ SiS_SetCHTVReg(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short 
         }

      } else {						/* ---- PAL ---- */

	/* We don't play around with FSCI in PAL mode */

         if(resindex == 0x04) {

            SiS_SetCH70xxANDOR(SiS_Pr,0x20,0x00,0xEF);	/* loop filter off */

            SiS_SetCH70xxANDOR(SiS_Pr,0x21,0x01,0xFE);	/* ACIV on */

         } else {

	SiS_SetCH70xxANDOR(SiS_Pr, 0x20, 0x00, 0xEF);	/* loop filter off */

	SiS_SetCH70xxANDOR(SiS_Pr, 0x21, 0x01, 0xFE);	/* ACIV on */

      }

      }



#endif  /* 300 */
@@ -9657,8 +9650,6 @@ SetDelayComp(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 
	      delay = 0x0a;

	   } else if(IS_SIS740) {

	      delay = 0x00;

	   } else if(SiS_Pr->ChipType < SIS_330) {

	      delay = 0x0c;

	   } else {

	      delay = 0x0c;

	   }