mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Miguel Gómez" <magomez@igalia.com>
To: arnaud.patard@rtp-net.org, gregkh@linuxfoundation.org,
	aaro.koskinen@iki.fi, dan.carpenter@oracle.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	"Miguel Gómez" <magomez@igalia.com>
Subject: [PATCH 10/19] Staging: xgifb: Rework conditions in XGI_SetATTRegs().
Date: Thu,  5 Jul 2012 16:45:53 +0200	[thread overview]
Message-ID: <4d7f549c19ccf6bad194f189ed3a902795ffdba2.1341498466.git.magomez@igalia.com> (raw)
In-Reply-To: <cover.1341498465.git.magomez@igalia.com>
In-Reply-To: <cover.1341498465.git.magomez@igalia.com>

Rework some conditions to reduce indentation and fix style warnings.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
---
 drivers/staging/xgifb/vb_setmode.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 3ba3c48..4b49705 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -161,18 +161,15 @@ static void XGI_SetATTRegs(unsigned short ModeNo,
 
 	for (i = 0; i <= 0x13; i++) {
 		ARdata = pVBInfo->StandTable->ATTR[i];
-		if (modeflag & Charx8Dot) { /* ifndef Dot9 */
-			if (i == 0x13) {
-				if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
+
+		if ((modeflag & Charx8Dot) && i == 0x13) { /* ifndef Dot9 */
+			if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
+				ARdata = 0;
+			} else {
+				if ((pVBInfo->VBInfo &
+				     (SetCRT2ToTV | SetCRT2ToLCD)) &&
+				    (pVBInfo->VBInfo & SetInSlaveMode))
 					ARdata = 0;
-				} else {
-					if (pVBInfo->VBInfo & (SetCRT2ToTV
-							| SetCRT2ToLCD)) {
-						if (pVBInfo->VBInfo &
-						    SetInSlaveMode)
-							ARdata = 0;
-					}
-				}
 			}
 		}
 
-- 
1.7.9.5


  parent reply	other threads:[~2012-07-05 14:46 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-05 14:45 [PATCH 00/19] Several cleanings and style fixes Miguel Gómez
2012-07-05 14:45 ` [PATCH 01/19] Staging: xgifb: Comment cleaning Miguel Gómez
2012-07-05 17:24   ` Aaro Koskinen
2012-07-06  8:00     ` Miguel Gómez
2012-07-05 17:35   ` Joe Perches
2012-07-06  8:02     ` Miguel Gómez
2012-07-05 20:35   ` Dan Carpenter
2012-07-06  8:14     ` Miguel Gómez
2012-07-05 14:45 ` [PATCH 02/19] Staging: xgifb: Remove unneeded XGI_LCD_TYPE enumeration Miguel Gómez
2012-07-05 14:45 ` [PATCH 03/19] Staging: xgifb: Remove LCDA detection in xgifb_probe() Miguel Gómez
2012-07-05 14:45 ` [PATCH 04/19] Staging: xgifb: Remove unused struct _chswtable Miguel Gómez
2012-07-05 14:45 ` [PATCH 05/19] Staging: xgifb: Improve debug strings Miguel Gómez
2012-07-05 17:42   ` Aaro Koskinen
2012-07-06  8:09     ` Miguel Gómez
2012-07-05 14:45 ` [PATCH 06/19] Staging: xgifb: Remove useless switch in XGIfb_detect_VB() Miguel Gómez
2012-07-05 14:45 ` [PATCH 07/19] Staging: xgifb: Simplify XGIfb_GetXG21DefaultLVDSModeIdx() Miguel Gómez
2012-07-05 14:45 ` [PATCH 08/19] Staging: xgifb: Remove unneeded var and condition in XGIfb_search_vesamode() Miguel Gómez
2012-07-05 14:45 ` [PATCH 09/19] Staging: xgifb: Remove useless always true condition Miguel Gómez
2012-07-05 14:45 ` Miguel Gómez [this message]
2012-07-05 14:45 ` [PATCH 11/19] Staging: xgifb: Refactor XGI_AjustCRT2Rate() Miguel Gómez
2012-07-05 14:45 ` [PATCH 12/19] Staging: xgifb: Refactor XGI_GetVBType() Miguel Gómez
2012-07-05 14:45 ` [PATCH 13/19] Staging: xgifb: Rework conditions in XGI_GetVBInfo() Miguel Gómez
2012-07-05 14:45 ` [PATCH 14/19] Staging: xgifb: Refactor XGI_GetCRT2ResInfo() Miguel Gómez
2012-07-05 14:45 ` [PATCH 15/19] Staging: xgifb: Rework conditions in XGI_SetLockRegs() Miguel Gómez
2012-07-05 18:00   ` Aaro Koskinen
2012-07-06  8:12     ` Miguel Gómez
2012-07-06  6:51   ` Dan Carpenter
2012-07-06  9:04     ` Miguel Gómez
2012-07-06 10:27       ` Dan Carpenter
2012-07-05 14:45 ` [PATCH 16/19] Staging: xgifb: Rework conditions in XGI_EnableBridge() Miguel Gómez
2012-07-05 14:46 ` [PATCH 17/19] Staging: xgifb: Rework some conditions in XGI_SetCRT2ModeRegs() Miguel Gómez
2012-07-05 14:46 ` [PATCH 18/19] Staging: xgifb: Fix coding style Miguel Gómez
2012-07-05 14:46 ` [PATCH 19/19] Staging: xgifb: Remove useless condition Miguel Gómez
2012-07-06 10:40 ` [PATCH 00/19 v2] Several cleanings and style fixes Miguel Gómez
2012-07-06 10:40   ` [PATCH 01/19 v2] Staging: xgifb: Comment cleaning Miguel Gómez
2012-07-06 10:40   ` [PATCH 02/19 v2] Staging: xgifb: Remove unneeded XGI_LCD_TYPE enumeration Miguel Gómez
2012-07-06 10:40   ` [PATCH 03/19 v2] Staging: xgifb: Remove LCDA detection in xgifb_probe() Miguel Gómez
2012-07-09 18:39     ` Greg KH
2012-07-09 22:08       ` Aaro Koskinen
2012-07-13 14:02       ` Miguel Gómez
2012-07-06 10:40   ` [PATCH 04/19 v2] Staging: xgifb: Remove unused struct _chswtable Miguel Gómez
2012-07-06 10:40   ` [PATCH 05/19 v2] Staging: xgifb: Improve debug strings Miguel Gómez
2012-07-06 10:40   ` [PATCH 06/19 v2] Staging: xgifb: Remove useless switch in XGIfb_detect_VB() Miguel Gómez
2012-07-06 10:40   ` [PATCH 07/19 v2] Staging: xgifb: Simplify XGIfb_GetXG21DefaultLVDSModeIdx() Miguel Gómez
2012-07-06 10:40   ` [PATCH 08/19 v2] Staging: xgifb: Remove unneeded var and condition in XGIfb_search_vesamode() Miguel Gómez
2012-07-06 10:40   ` [PATCH 09/19 v2] Staging: xgifb: Remove useless always true condition Miguel Gómez
2012-07-06 10:40   ` [PATCH 10/19 v2] Staging: xgifb: Rework conditions in XGI_SetATTRegs() Miguel Gómez
2012-07-06 10:40   ` [PATCH 11/19 v2] Staging: xgifb: Refactor XGI_AjustCRT2Rate() Miguel Gómez
2012-07-06 10:40   ` [PATCH 12/19 v2] Staging: xgifb: Refactor XGI_GetVBType() Miguel Gómez
2012-07-06 10:40   ` [PATCH 13/19 v2] Staging: xgifb: Rework conditions in XGI_GetVBInfo() Miguel Gómez
2012-07-06 10:40   ` [PATCH 14/19 v2] Staging: xgifb: Refactor XGI_GetCRT2ResInfo() Miguel Gómez
2012-07-06 10:40   ` [PATCH 15/19 v2] Staging: xgifb: Rework conditions in XGI_SetLockRegs() Miguel Gómez
2012-07-06 10:40   ` [PATCH 16/19 v2] Staging: xgifb: Rework conditions in XGI_EnableBridge() Miguel Gómez
2012-07-06 10:40   ` [PATCH 17/19 v2] Staging: xgifb: Rework some conditions in XGI_SetCRT2ModeRegs() Miguel Gómez
2012-07-06 10:40   ` [PATCH 18/19 v2] Staging: xgifb: Fix coding style Miguel Gómez
2012-07-06 10:40   ` [PATCH 19/19 v2] Staging: xgifb: Remove useless condition Miguel Gómez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4d7f549c19ccf6bad194f189ed3a902795ffdba2.1341498466.git.magomez@igalia.com \
    --to=magomez@igalia.com \
    --cc=aaro.koskinen@iki.fi \
    --cc=arnaud.patard@rtp-net.org \
    --cc=dan.carpenter@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®