Skip to content

Commit

Permalink
staging/xgifb: Inline XGINew_SetDRAMSizingType
Browse files Browse the repository at this point in the history
Since the function XGINew_SetDRAMSizingType is only called from one
location and consist only of 2 valuable lines we can simply inline it
here.

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 Jun 14, 2012
1 parent 672f5ee commit 4e55d0b
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/staging/xgifb/vb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,17 +579,6 @@ static void XGINew_SetDRAMDefaultRegister340(
pVBInfo->SR15[3][pVBInfo->ram_type]); /* SR1B */
}

static void XGINew_SetDRAMSizingType(int index,
const unsigned short DRAMTYPE_TABLE[][5],
struct vb_device_info *pVBInfo)
{
unsigned short data;

data = DRAMTYPE_TABLE[index][4];
xgifb_reg_and_or(pVBInfo->P3c4, 0x13, 0x80, data);
udelay(15);
/* should delay 50 ns */
}

static unsigned short XGINew_SetDRAMSize20Reg(int index,
const unsigned short DRAMTYPE_TABLE[][5],
Expand Down Expand Up @@ -912,7 +901,10 @@ static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
}

for (i = 0; i < size; i++) {
XGINew_SetDRAMSizingType(i, dram_table, pVBInfo);
/* SetDRAMSizingType */
xgifb_reg_and_or(pVBInfo->P3c4, 0x13, 0x80, dram_table[i][4]);
udelay(15); /* should delay 50 ns */

memsize = XGINew_SetDRAMSize20Reg(i, dram_table, pVBInfo);

if (memsize == 0)
Expand Down

0 comments on commit 4e55d0b

Please sign in to comment.