From: Sam Hansen <solid.se7en@gmail.com>
To: Arnaud Patard <arnaud.patard@rtp-net.org>,
Greg Kroah-Hartman <gregkh@suse.de>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Dan Carpenter <dan.carpenter@oracle.com>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Sam Hansen <solid.se7en@gmail.com>
Subject: [PATCH V2 1/3] xgifb: checkpatch cleanup braces
Date: Sun, 22 Jan 2012 16:48:51 -0800 [thread overview]
Message-ID: <1327279733-3350-2-git-send-email-solid.se7en@gmail.com> (raw)
In-Reply-To: <1327279733-3350-1-git-send-email-solid.se7en@gmail.com>
In-Reply-To: <originalemailid>
Cleaned up XGI_main_26.c and removed some unneeded braces to keep with code
conventions.
Signed-off-by: Sam Hansen <solid.se7en@gmail.com>
---
drivers/staging/xgifb/XGI_main_26.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 2502c49..dd97b73 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -2033,13 +2033,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
xgifb_info->hasVB = HASVB_NONE;
} else if (xgifb_info->chip == XG21) {
CR38 = xgifb_reg_get(XGICR, 0x38);
- if ((CR38&0xE0) == 0xC0) {
+ if ((CR38&0xE0) == 0xC0)
xgifb_info->display2 = XGIFB_DISP_LCD;
- } else if ((CR38&0xE0) == 0x60) {
+ else if ((CR38&0xE0) == 0x60)
xgifb_info->hasVB = HASVB_CHRONTEL;
- } else {
+ else
xgifb_info->hasVB = HASVB_NONE;
- }
} else {
XGIfb_get_VB_type(xgifb_info);
}
@@ -2147,9 +2146,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (tmp & 0x20) {
tmp = xgifb_reg_get(
XGIPART1, 0x13);
- if (tmp & 0x04) {
- /* XGI_Pr.XGI_UseLCDA = 1; */
- }
}
}
}
--
1.7.5.4
next prev parent reply other threads:[~2012-01-23 0:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <originalemailid>
2012-01-23 0:48 ` [PATCH V2 0/3] xgifb: patch set Sam Hansen
2012-01-23 0:48 ` Sam Hansen [this message]
2012-01-23 0:48 ` [PATCH V2 2/3] xgifb: checkpatch cleanup __func__ Sam Hansen
2012-01-23 0:48 ` [PATCH V2 3/3] xgifb: checkpatch cleanup printk() -> pr_lvl() Sam Hansen
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=1327279733-3350-2-git-send-email-solid.se7en@gmail.com \
--to=solid.se7en@gmail.com \
--cc=aaro.koskinen@iki.fi \
--cc=arnaud.patard@rtp-net.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--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
Powered by JetHome