From: Aaro Koskinen <aaro.koskinen@iki.fi> To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@winischhofer.net Cc: aaro.koskinen@iki.fi Subject: [PATCH 03/13] sisfb: remove duplicate function declarations Date: Mon, 20 Dec 2010 23:50:12 +0200 [thread overview] Message-ID: <1292881822-32630-4-git-send-email-aaro.koskinen@iki.fi> (raw) In-Reply-To: <1292881822-32630-1-git-send-email-aaro.koskinen@iki.fi> 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> --- drivers/video/sis/init.h | 13 ------------- drivers/video/sis/init301.h | 11 ----------- 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 ee8ed3c..aff7384 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 unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay, int Depth, unsigned int VBFlags2); -void SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data); -void SiS_SetRegByte(SISIOADDRESS port, unsigned short data); -void SiS_SetRegShort(SISIOADDRESS port, unsigned short data); -void SiS_SetRegLong(SISIOADDRESS port, unsigned int data); -unsigned char SiS_GetReg(SISIOADDRESS port, unsigned short index); -unsigned char SiS_GetRegByte(SISIOADDRESS port); -unsigned short SiS_GetRegShort(SISIOADDRESS port); -unsigned int SiS_GetRegLong(SISIOADDRESS port); -void SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, - unsigned short DataOR); -void SiS_SetRegAND(SISIOADDRESS Port,unsigned short Index, unsigned short DataAND); -void SiS_SetRegOR(SISIOADDRESS Port,unsigned short Index, unsigned short DataOR); - void SiS_DisplayOn(struct SiS_Private *SiS_Pr); void SiS_DisplayOff(struct SiS_Private *SiS_Pr); void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index e1fd31d..2112d6d 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, static void SiS_FinalizeLCD(struct SiS_Private *, unsigned short, unsigned short); #endif -extern void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); -extern void SiS_SetRegByte(SISIOADDRESS, unsigned short); -extern void SiS_SetRegShort(SISIOADDRESS, unsigned short); -extern void SiS_SetRegLong(SISIOADDRESS, unsigned int); -extern unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); -extern unsigned char SiS_GetRegByte(SISIOADDRESS); -extern unsigned short SiS_GetRegShort(SISIOADDRESS); -extern unsigned int SiS_GetRegLong(SISIOADDRESS); -extern void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); -extern void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); -extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); 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 80d89d3..a94272d 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h @@ -307,7 +307,20 @@ #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) -/* I/O port access macros */ +/* I/O port access macros and functions */ + +void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); +void SiS_SetRegByte(SISIOADDRESS, unsigned short); +void SiS_SetRegShort(SISIOADDRESS, unsigned short); +void SiS_SetRegLong(SISIOADDRESS, unsigned int); +void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); +void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); +void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); +unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); +unsigned char SiS_GetRegByte(SISIOADDRESS); +unsigned short SiS_GetRegShort(SISIOADDRESS); +unsigned int SiS_GetRegLong(SISIOADDRESS); + #define inSISREG(base) inb(base) #define outSISREG(base,val) outb(val,base) -- 1.5.6.5
WARNING: multiple messages have this Message-ID (diff)
From: Aaro Koskinen <aaro.koskinen@iki.fi> To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@winischhofer.net Cc: aaro.koskinen@iki.fi Subject: [PATCH 03/13] sisfb: remove duplicate function declarations Date: Mon, 20 Dec 2010 21:50:12 +0000 [thread overview] Message-ID: <1292881822-32630-4-git-send-email-aaro.koskinen@iki.fi> (raw) In-Reply-To: <1292881822-32630-1-git-send-email-aaro.koskinen@iki.fi> 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> --- drivers/video/sis/init.h | 13 ------------- drivers/video/sis/init301.h | 11 ----------- 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 ee8ed3c..aff7384 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 unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay, int Depth, unsigned int VBFlags2); -void SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data); -void SiS_SetRegByte(SISIOADDRESS port, unsigned short data); -void SiS_SetRegShort(SISIOADDRESS port, unsigned short data); -void SiS_SetRegLong(SISIOADDRESS port, unsigned int data); -unsigned char SiS_GetReg(SISIOADDRESS port, unsigned short index); -unsigned char SiS_GetRegByte(SISIOADDRESS port); -unsigned short SiS_GetRegShort(SISIOADDRESS port); -unsigned int SiS_GetRegLong(SISIOADDRESS port); -void SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, - unsigned short DataOR); -void SiS_SetRegAND(SISIOADDRESS Port,unsigned short Index, unsigned short DataAND); -void SiS_SetRegOR(SISIOADDRESS Port,unsigned short Index, unsigned short DataOR); - void SiS_DisplayOn(struct SiS_Private *SiS_Pr); void SiS_DisplayOff(struct SiS_Private *SiS_Pr); void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index e1fd31d..2112d6d 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, static void SiS_FinalizeLCD(struct SiS_Private *, unsigned short, unsigned short); #endif -extern void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); -extern void SiS_SetRegByte(SISIOADDRESS, unsigned short); -extern void SiS_SetRegShort(SISIOADDRESS, unsigned short); -extern void SiS_SetRegLong(SISIOADDRESS, unsigned int); -extern unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); -extern unsigned char SiS_GetRegByte(SISIOADDRESS); -extern unsigned short SiS_GetRegShort(SISIOADDRESS); -extern unsigned int SiS_GetRegLong(SISIOADDRESS); -extern void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); -extern void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); -extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); 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 80d89d3..a94272d 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h @@ -307,7 +307,20 @@ #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) -/* I/O port access macros */ +/* I/O port access macros and functions */ + +void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); +void SiS_SetRegByte(SISIOADDRESS, unsigned short); +void SiS_SetRegShort(SISIOADDRESS, unsigned short); +void SiS_SetRegLong(SISIOADDRESS, unsigned int); +void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); +void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); +void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); +unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); +unsigned char SiS_GetRegByte(SISIOADDRESS); +unsigned short SiS_GetRegShort(SISIOADDRESS); +unsigned int SiS_GetRegLong(SISIOADDRESS); + #define inSISREG(base) inb(base) #define outSISREG(base,val) outb(val,base) -- 1.5.6.5
next prev parent reply other threads:[~2010-12-20 21:52 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-12-20 21:50 [PATCH 00/13] Further sisfb cleanups Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 01/13] sisfb: eliminate unused variable compiler warning Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 02/13] sisfb: delete HAVE_CONFIG_H checks Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen [this message] 2010-12-20 21:50 ` [PATCH 03/13] sisfb: remove duplicate function declarations Aaro Koskinen 2010-12-20 21:50 ` [PATCH 04/13] sisfb: change register I/O functions to use fixed size types Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 05/13] sisfb: replace inSISREG with SiS_GetRegByte Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 06/13] sisfb: replace outSISREG with SiS_SetRegByte Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 07/13] sisfb: replace inSISIDXREG with SiS_GetReg Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 08/13] sisfb: replace outSISIDXREG with SiS_SetReg Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 09/13] sisfb: replace orSISIDXREG with SiS_SetRegOR Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 10/13] sisfb: replace andSISIDXREG with SiS_SetRegAND Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 11/13] sisfb: replace setSISIDXREG with SiS_SetRegANDOR Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 12/13] sisfb: delete unused register I/O macros Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-20 21:50 ` [PATCH 13/13] sisfb: eliminate compiler warnings Aaro Koskinen 2010-12-20 21:50 ` Aaro Koskinen 2010-12-22 4:00 ` [PATCH 00/13] Further sisfb cleanups Paul Mundt 2010-12-22 4:00 ` Paul Mundt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1292881822-32630-4-git-send-email-aaro.koskinen@iki.fi \ --to=aaro.koskinen@iki.fi \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=thomas@winischhofer.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.