Skip to content

Commit

Permalink
staging/xgifb: Remove unused values in XG27_SR13 and XGI340_SR13
Browse files Browse the repository at this point in the history
 In the lookup tables XG27_SR13 and XGI340_SR13 only the first three
 values are used of each 'line', thus the remaining fields can be
 removed.

Rationale:
- vb_init.c uses pVBInfo->ram_type for the 'column' index for
pVBInfo->SR15.

- pVBInfo->ram_type is assigned the return value of
XGINew_GetXG20DRAMType which can only be 0, 1 or 2

- pVBInfo->SR15 is assigned to either XG27_SR13 or XGI340_SR13 in
vb_setmode.c

-> only the first three values are used.
This becomes also evident as values 3-7 are all 0.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Feb 5, 2013
1 parent 87be0af commit 86c6c94
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/xgifb/vb_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ struct vb_device_info {

void __iomem *FBAddr;

unsigned char const (*SR15)[8];
unsigned char const (*SR15)[3];
unsigned char const (*CR40)[3];

struct SiS_MCLKData const *MCLKData;
Expand Down
24 changes: 12 additions & 12 deletions drivers/staging/xgifb/vb_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
{0x5c, 0x23, 0x01, 166}
};

static const unsigned char XG27_SR13[4][8] = {
{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
{0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00} /* SR1B */
};

static const unsigned char XGI340_SR13[4][8] = {
{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
{0x31, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00} /* SR1B */
static const unsigned char XG27_SR13[4][3] = {
{0x35, 0x45, 0xb1}, /* SR13 */
{0x41, 0x51, 0x5c}, /* SR14 */
{0x32, 0x32, 0x42}, /* SR18 */
{0x03, 0x03, 0x03} /* SR1B */
};

static const unsigned char XGI340_SR13[4][3] = {
{0x35, 0x45, 0xb1}, /* SR13 */
{0x41, 0x51, 0x5c}, /* SR14 */
{0x31, 0x42, 0x42}, /* SR18 */
{0x03, 0x03, 0x03} /* SR1B */
};

static const unsigned char XGI340_cr41[24][3] = {
Expand Down

0 comments on commit 86c6c94

Please sign in to comment.