openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: sm7xxfb: dead code removal 

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Javier M. Mellid 2012-06-26 06:00:15 +02:00 committed by Greg Kroah-Hartman
parent 9b1904c7cf
commit 50b238b186
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/sm7xxfb/sm7xxfb.c
View File

@ -53,7 +53,7 @@ struct smtcfb_info {
u_int width; u_int width;
u_int height; u_int height;
u_int hz; u_int hz;
u_long BaseAddressInVRAM;
u8 chipRevID; 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, static void sm712_setpalette(int regno, unsigned red, unsigned green,
unsigned blue, struct fb_info *info) 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(regno, dac_reg);
smtc_mmiowb(red >> 10, dac_val); smtc_mmiowb(red >> 10, dac_val);
smtc_mmiowb(green >> 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; goto failed;
smtcfb_setmode(sfb); smtcfb_setmode(sfb);
/* Primary display starting from 0 position */
sfb->BaseAddressInVRAM = 0;
err = register_framebuffer(&sfb->fb); err = register_framebuffer(&sfb->fb);
if (err < 0) if (err < 0)