From: "Javier M. Mellid" <jmunhoz@igalia.com>
To: gregkh@linuxfoundation.org, gewang@siliconmotion.com,
boyod.yang@siliconmotion.com.cn
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
"Javier M. Mellid" <jmunhoz@igalia.com>
Subject: [PATCH 2/4] staging: sm7xxfb: dead code removal
Date: Tue, 26 Jun 2012 06:00:15 +0200 [thread overview]
Message-ID: <1340683217-7986-3-git-send-email-jmunhoz@igalia.com> (raw)
In-Reply-To: <1340683217-7986-1-git-send-email-jmunhoz@igalia.com>
From: "Javier M. Mellid" <jmunhoz@igalia.com>
This patch removes dead code related to BaseAddressInVRAM. It fixes
comment on RAM control bits too.
Tested with SM712.
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index a8c5652..4ab149b 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -53,7 +53,7 @@ struct smtcfb_info {
u_int width;
u_int height;
u_int hz;
- u_long BaseAddressInVRAM;
+
u8 chipRevID;
};
@@ -220,17 +220,9 @@ static void sm712_set_timing(struct smtcfb_info *sfb)
static void sm712_setpalette(int regno, unsigned red, unsigned green,
unsigned blue, struct fb_info *info)
{
- struct smtcfb_info *sfb = info->par;
+ /* set bit 5:4 = 01 (write LCD RAM only) */
+ smtc_seqw(0x66, (smtc_seqr(0x66) & 0xC3) | 0x10);
- if (sfb->BaseAddressInVRAM)
- /*
- * second display palette for dual head. Enable CRT RAM, 6-bit
- * RAM
- */
- smtc_seqw(0x66, (smtc_seqr(0x66) & 0xC3) | 0x20);
- else
- /* primary display palette. Enable LCD RAM only, 6-bit RAM */
- smtc_seqw(0x66, (smtc_seqr(0x66) & 0xC3) | 0x10);
smtc_mmiowb(regno, dac_reg);
smtc_mmiowb(red >> 10, dac_val);
smtc_mmiowb(green >> 10, dac_val);
@@ -932,8 +924,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
goto failed;
smtcfb_setmode(sfb);
- /* Primary display starting from 0 position */
- sfb->BaseAddressInVRAM = 0;
err = register_framebuffer(&sfb->fb);
if (err < 0)
--
1.7.10
next prev parent reply other threads:[~2012-06-26 4:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-26 4:00 [PATCH 0/4] staging: sm7xxfb: code improvements and cleanup Javier M. Mellid
2012-06-26 4:00 ` [PATCH 1/4] staging: sm7xxfb: dead code removal Javier M. Mellid
2012-06-26 4:00 ` Javier M. Mellid [this message]
2012-06-26 4:00 ` [PATCH 3/4] staging: sm7xxfb: delete unnecessary color map allocation Javier M. Mellid
2012-06-26 4:00 ` [PATCH 4/4] staging: sm7xxfb: code cleanup on smtcfb_setmode Javier M. Mellid
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=1340683217-7986-3-git-send-email-jmunhoz@igalia.com \
--to=jmunhoz@igalia.com \
--cc=boyod.yang@siliconmotion.com.cn \
--cc=devel@driverdev.osuosl.org \
--cc=gewang@siliconmotion.com \
--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®