diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-12-20 16:50:12 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:41 -0500 |
commit | e68046b72e9b35d054e3d98d71dc2c69d7e88e1e (patch) | |
tree | fdada04a4b78266482e6794206883d8589cc67ff /drivers/video/sis | |
parent | b5b7dda7b5d9126d531ffa212b6a89d72aeac90a (diff) |
sisfb: remove duplicate function declarations
Remove duplicate register I/O function declarations by moving them into
a common header file.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r-- | drivers/video/sis/init.h | 13 | ||||
-rw-r--r-- | drivers/video/sis/init301.h | 11 | ||||
-rw-r--r-- | drivers/video/sis/sis.h | 15 |
3 files changed, 14 insertions, 25 deletions
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h index ee8ed3c203da..aff73842d877 100644 --- a/drivers/video/sis/init.h +++ b/drivers/video/sis/init.h | |||
@@ -1516,19 +1516,6 @@ unsigned short SiS_GetModeID_TV(int VGAEngine, unsigned int VBFlags, int HDispla | |||
1516 | unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, | 1516 | unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, |
1517 | int VDisplay, int Depth, unsigned int VBFlags2); | 1517 | int VDisplay, int Depth, unsigned int VBFlags2); |
1518 | 1518 | ||
1519 | void SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data); | ||
1520 | void SiS_SetRegByte(SISIOADDRESS port, unsigned short data); | ||
1521 | void SiS_SetRegShort(SISIOADDRESS port, unsigned short data); | ||
1522 | void SiS_SetRegLong(SISIOADDRESS port, unsigned int data); | ||
1523 | unsigned char SiS_GetReg(SISIOADDRESS port, unsigned short index); | ||
1524 | unsigned char SiS_GetRegByte(SISIOADDRESS port); | ||
1525 | unsigned short SiS_GetRegShort(SISIOADDRESS port); | ||
1526 | unsigned int SiS_GetRegLong(SISIOADDRESS port); | ||
1527 | void SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, | ||
1528 | unsigned short DataOR); | ||
1529 | void SiS_SetRegAND(SISIOADDRESS Port,unsigned short Index, unsigned short DataAND); | ||
1530 | void SiS_SetRegOR(SISIOADDRESS Port,unsigned short Index, unsigned short DataOR); | ||
1531 | |||
1532 | void SiS_DisplayOn(struct SiS_Private *SiS_Pr); | 1519 | void SiS_DisplayOn(struct SiS_Private *SiS_Pr); |
1533 | void SiS_DisplayOff(struct SiS_Private *SiS_Pr); | 1520 | void SiS_DisplayOff(struct SiS_Private *SiS_Pr); |
1534 | void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); | 1521 | void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); |
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index e1fd31d0fddf..2112d6d7feda 100644 --- a/drivers/video/sis/init301.h +++ b/drivers/video/sis/init301.h | |||
@@ -428,17 +428,6 @@ static void SiS_OEM661Setting(struct SiS_Private *SiS_Pr, | |||
428 | static void SiS_FinalizeLCD(struct SiS_Private *, unsigned short, unsigned short); | 428 | static void SiS_FinalizeLCD(struct SiS_Private *, unsigned short, unsigned short); |
429 | #endif | 429 | #endif |
430 | 430 | ||
431 | extern void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); | ||
432 | extern void SiS_SetRegByte(SISIOADDRESS, unsigned short); | ||
433 | extern void SiS_SetRegShort(SISIOADDRESS, unsigned short); | ||
434 | extern void SiS_SetRegLong(SISIOADDRESS, unsigned int); | ||
435 | extern unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); | ||
436 | extern unsigned char SiS_GetRegByte(SISIOADDRESS); | ||
437 | extern unsigned short SiS_GetRegShort(SISIOADDRESS); | ||
438 | extern unsigned int SiS_GetRegLong(SISIOADDRESS); | ||
439 | extern void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); | ||
440 | extern void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); | ||
441 | extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); | ||
442 | extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); | 431 | extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); |
443 | extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); | 432 | extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); |
444 | extern bool SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *); | 433 | extern bool SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *); |
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h index 80d89d37c414..a94272d0126e 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h | |||
@@ -307,7 +307,20 @@ | |||
307 | #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) | 307 | #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) |
308 | #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) | 308 | #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) |
309 | 309 | ||
310 | /* I/O port access macros */ | 310 | /* I/O port access macros and functions */ |
311 | |||
312 | void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); | ||
313 | void SiS_SetRegByte(SISIOADDRESS, unsigned short); | ||
314 | void SiS_SetRegShort(SISIOADDRESS, unsigned short); | ||
315 | void SiS_SetRegLong(SISIOADDRESS, unsigned int); | ||
316 | void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); | ||
317 | void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); | ||
318 | void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); | ||
319 | unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); | ||
320 | unsigned char SiS_GetRegByte(SISIOADDRESS); | ||
321 | unsigned short SiS_GetRegShort(SISIOADDRESS); | ||
322 | unsigned int SiS_GetRegLong(SISIOADDRESS); | ||
323 | |||
311 | #define inSISREG(base) inb(base) | 324 | #define inSISREG(base) inb(base) |
312 | 325 | ||
313 | #define outSISREG(base,val) outb(val,base) | 326 | #define outSISREG(base,val) outb(val,base) |