Commit b053af16 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: delete unused "HwDeviceExtension" parameters

Delete unused "HwDeviceExtension" parameters from internal functions.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b6e6a39
...@@ -102,10 +102,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, ...@@ -102,10 +102,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
xgifb_reg_set(P3c4, 0x1B, 0x00); xgifb_reg_set(P3c4, 0x1B, 0x00);
} }
static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetMemoryClock(struct vb_device_info *pVBInfo)
struct vb_device_info *pVBInfo)
{ {
xgifb_reg_set(pVBInfo->P3c4, xgifb_reg_set(pVBInfo->P3c4,
0x28, 0x28,
pVBInfo->MCLKData[pVBInfo->ram_type].SR28); pVBInfo->MCLKData[pVBInfo->ram_type].SR28);
...@@ -133,7 +131,7 @@ static void XGINew_DDRII_Bootup_XG27( ...@@ -133,7 +131,7 @@ static void XGINew_DDRII_Bootup_XG27(
{ {
unsigned long P3d4 = P3c4 + 0x10; unsigned long P3d4 = P3c4 + 0x10;
pVBInfo->ram_type = XGINew_GetXG20DRAMType(HwDeviceExtension, pVBInfo); pVBInfo->ram_type = XGINew_GetXG20DRAMType(HwDeviceExtension, pVBInfo);
XGINew_SetMemoryClock(HwDeviceExtension, pVBInfo); XGINew_SetMemoryClock(pVBInfo);
/* Set Double Frequency */ /* Set Double Frequency */
xgifb_reg_set(P3d4, 0x97, pVBInfo->XGINew_CR97); /* CR97 */ xgifb_reg_set(P3d4, 0x97, pVBInfo->XGINew_CR97); /* CR97 */
...@@ -206,7 +204,7 @@ static void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -206,7 +204,7 @@ static void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension,
unsigned long P3d4 = P3c4 + 0x10; unsigned long P3d4 = P3c4 + 0x10;
pVBInfo->ram_type = XGINew_GetXG20DRAMType(HwDeviceExtension, pVBInfo); pVBInfo->ram_type = XGINew_GetXG20DRAMType(HwDeviceExtension, pVBInfo);
XGINew_SetMemoryClock(HwDeviceExtension, pVBInfo); XGINew_SetMemoryClock(pVBInfo);
xgifb_reg_set(P3d4, 0x97, 0x11); /* CR97 */ xgifb_reg_set(P3d4, 0x97, 0x11); /* CR97 */
...@@ -280,7 +278,7 @@ static void XGINew_DDR1x_DefaultRegister( ...@@ -280,7 +278,7 @@ static void XGINew_DDR1x_DefaultRegister(
unsigned long P3d4 = Port, P3c4 = Port - 0x10; unsigned long P3d4 = Port, P3c4 = Port - 0x10;
if (HwDeviceExtension->jChipType >= XG20) { if (HwDeviceExtension->jChipType >= XG20) {
XGINew_SetMemoryClock(HwDeviceExtension, pVBInfo); XGINew_SetMemoryClock(pVBInfo);
xgifb_reg_set(P3d4, xgifb_reg_set(P3d4,
0x82, 0x82,
pVBInfo->CR40[11][pVBInfo->ram_type]); /* CR82 */ pVBInfo->CR40[11][pVBInfo->ram_type]); /* CR82 */
...@@ -296,7 +294,7 @@ static void XGINew_DDR1x_DefaultRegister( ...@@ -296,7 +294,7 @@ static void XGINew_DDR1x_DefaultRegister(
XGINew_DDR1x_MRS_XG20(P3c4, pVBInfo); XGINew_DDR1x_MRS_XG20(P3c4, pVBInfo);
} else { } else {
XGINew_SetMemoryClock(HwDeviceExtension, pVBInfo); XGINew_SetMemoryClock(pVBInfo);
switch (HwDeviceExtension->jChipType) { switch (HwDeviceExtension->jChipType) {
case XG42: case XG42:
...@@ -948,8 +946,7 @@ static bool xgifb_read_vbios(struct pci_dev *pdev, ...@@ -948,8 +946,7 @@ static bool xgifb_read_vbios(struct pci_dev *pdev,
return false; return false;
} }
static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_ChkSenseStatus(struct vb_device_info *pVBInfo)
struct vb_device_info *pVBInfo)
{ {
unsigned short tempbx = 0, temp, tempcx, CR3CData; unsigned short tempbx = 0, temp, tempcx, CR3CData;
...@@ -991,8 +988,7 @@ static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -991,8 +988,7 @@ static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
xgifb_reg_set(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8)); xgifb_reg_set(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8));
} }
static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetModeScratch(struct vb_device_info *pVBInfo)
struct vb_device_info *pVBInfo)
{ {
unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data; unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data;
...@@ -1126,8 +1122,7 @@ static void XGINew_GetXG21Sense(struct pci_dev *pdev, ...@@ -1126,8 +1122,7 @@ static void XGINew_GetXG21Sense(struct pci_dev *pdev,
} }
} }
static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_GetXG27Sense(struct vb_device_info *pVBInfo)
struct vb_device_info *pVBInfo)
{ {
unsigned char Temp, bCR4A; unsigned char Temp, bCR4A;
...@@ -1222,7 +1217,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) ...@@ -1222,7 +1217,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
XGINew_GetXG21Sense(pdev, pVBInfo); XGINew_GetXG21Sense(pdev, pVBInfo);
if (HwDeviceExtension->jChipType == XG27) if (HwDeviceExtension->jChipType == XG27)
XGINew_GetXG27Sense(HwDeviceExtension, pVBInfo); XGINew_GetXG27Sense(pVBInfo);
/* Reset Extended register */ /* Reset Extended register */
...@@ -1294,7 +1289,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) ...@@ -1294,7 +1289,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
if (HwDeviceExtension->jChipType < XG20) { if (HwDeviceExtension->jChipType < XG20) {
/* Set VB */ /* Set VB */
XGI_UnLockCRT2(HwDeviceExtension, pVBInfo); XGI_UnLockCRT2(pVBInfo);
/* disable VideoCapture */ /* disable VideoCapture */
xgifb_reg_and_or(pVBInfo->Part0Port, 0x3F, 0xEF, 0x00); xgifb_reg_and_or(pVBInfo->Part0Port, 0x3F, 0xEF, 0x00);
xgifb_reg_set(pVBInfo->Part1Port, 0x00, 0x00); xgifb_reg_set(pVBInfo->Part1Port, 0x00, 0x00);
...@@ -1334,7 +1329,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) ...@@ -1334,7 +1329,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
xgifb_reg_set(pVBInfo->Part4Port, xgifb_reg_set(pVBInfo->Part4Port,
0x10, XGI330_CRT2Data_4_10); 0x10, XGI330_CRT2Data_4_10);
xgifb_reg_set(pVBInfo->Part4Port, 0x0F, 0x3F); xgifb_reg_set(pVBInfo->Part4Port, 0x0F, 0x3F);
XGI_LockCRT2(HwDeviceExtension, pVBInfo); XGI_LockCRT2(pVBInfo);
} }
} /* != XG20 */ } /* != XG20 */
...@@ -1370,8 +1365,8 @@ unsigned char XGIInitNew(struct pci_dev *pdev) ...@@ -1370,8 +1365,8 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
xgifb_reg_set(pVBInfo->P3c4, 0x22, 0xfa); xgifb_reg_set(pVBInfo->P3c4, 0x22, 0xfa);
xgifb_reg_set(pVBInfo->P3c4, 0x21, 0xa3); xgifb_reg_set(pVBInfo->P3c4, 0x21, 0xa3);
XGINew_ChkSenseStatus(HwDeviceExtension, pVBInfo); XGINew_ChkSenseStatus(pVBInfo);
XGINew_SetModeScratch(HwDeviceExtension, pVBInfo); XGINew_SetModeScratch(pVBInfo);
xgifb_reg_set(pVBInfo->P3d4, 0x8c, 0x87); xgifb_reg_set(pVBInfo->P3d4, 0x8c, 0x87);
......
This diff is collapsed.
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
#define _VBSETMODE_ #define _VBSETMODE_
extern void InitTo330Pointer(unsigned char, struct vb_device_info *); extern void InitTo330Pointer(unsigned char, struct vb_device_info *);
extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, extern void XGI_UnLockCRT2(struct vb_device_info *);
struct vb_device_info *); extern void XGI_LockCRT2(struct vb_device_info *);
extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *);
extern void XGI_DisplayOff(struct xgifb_video_info *, extern void XGI_DisplayOff(struct xgifb_video_info *,
struct xgi_hw_device_info *, struct xgi_hw_device_info *,
struct vb_device_info *); struct vb_device_info *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment