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 04/13] sisfb: change register I/O functions to use fixed size types
Date: Mon, 20 Dec 2010 21:50:13 +0000 [thread overview]
Message-ID: <1292881822-32630-5-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1292881822-32630-1-git-send-email-aaro.koskinen@iki.fi>
Use fixed-sized types (u8, u16, u32) instead of plain C types.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
drivers/video/sis/init.c | 42 +++++++++++++++++++++---------------------
drivers/video/sis/sis.h | 22 +++++++++++-----------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c
index 5f49db1..66de832 100644
--- a/drivers/video/sis/init.c
+++ b/drivers/video/sis/init.c
@@ -876,59 +876,59 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl
/*********************************************/
void
-SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data)
+SiS_SetReg(SISIOADDRESS port, u8 index, u8 data)
{
- outb((u8)index, port);
- outb((u8)data, port + 1);
+ outb(index, port);
+ outb(data, port + 1);
}
void
-SiS_SetRegByte(SISIOADDRESS port, unsigned short data)
+SiS_SetRegByte(SISIOADDRESS port, u8 data)
{
- outb((u8)data, port);
+ outb(data, port);
}
void
-SiS_SetRegShort(SISIOADDRESS port, unsigned short data)
+SiS_SetRegShort(SISIOADDRESS port, u16 data)
{
- outw((u16)data, port);
+ outw(data, port);
}
void
-SiS_SetRegLong(SISIOADDRESS port, unsigned int data)
+SiS_SetRegLong(SISIOADDRESS port, u32 data)
{
- outl((u32)data, port);
+ outl(data, port);
}
-unsigned char
-SiS_GetReg(SISIOADDRESS port, unsigned short index)
+u8
+SiS_GetReg(SISIOADDRESS port, u8 index)
{
- outb((u8)index, port);
+ outb(index, port);
return inb(port + 1);
}
-unsigned char
+u8
SiS_GetRegByte(SISIOADDRESS port)
{
return inb(port);
}
-unsigned short
+u16
SiS_GetRegShort(SISIOADDRESS port)
{
return inw(port);
}
-unsigned int
+u32
SiS_GetRegLong(SISIOADDRESS port)
{
return inl(port);
}
void
-SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, unsigned short DataOR)
+SiS_SetRegANDOR(SISIOADDRESS Port, u8 Index, u8 DataAND, u8 DataOR)
{
- unsigned short temp;
+ u8 temp;
temp = SiS_GetReg(Port, Index);
temp = (temp & (DataAND)) | DataOR;
@@ -936,9 +936,9 @@ SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND,
}
void
-SiS_SetRegAND(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND)
+SiS_SetRegAND(SISIOADDRESS Port, u8 Index, u8 DataAND)
{
- unsigned short temp;
+ u8 temp;
temp = SiS_GetReg(Port, Index);
temp &= DataAND;
@@ -946,9 +946,9 @@ SiS_SetRegAND(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND)
}
void
-SiS_SetRegOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataOR)
+SiS_SetRegOR(SISIOADDRESS Port, u8 Index, u8 DataOR)
{
- unsigned short temp;
+ u8 temp;
temp = SiS_GetReg(Port, Index);
temp |= DataOR;
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index a94272d..acf0766 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -309,17 +309,17 @@
/* 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);
+void SiS_SetReg(SISIOADDRESS, u8, u8);
+void SiS_SetRegByte(SISIOADDRESS, u8);
+void SiS_SetRegShort(SISIOADDRESS, u16);
+void SiS_SetRegLong(SISIOADDRESS, u32);
+void SiS_SetRegANDOR(SISIOADDRESS, u8, u8, u8);
+void SiS_SetRegAND(SISIOADDRESS, u8, u8);
+void SiS_SetRegOR(SISIOADDRESS, u8, u8);
+u8 SiS_GetReg(SISIOADDRESS, u8);
+u8 SiS_GetRegByte(SISIOADDRESS);
+u16 SiS_GetRegShort(SISIOADDRESS);
+u32 SiS_GetRegLong(SISIOADDRESS);
#define inSISREG(base) inb(base)
--
1.5.6.5
next prev parent reply other threads:[~2010-12-20 21:50 UTC|newest]
Thread overview: 15+ 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 ` [PATCH 01/13] sisfb: eliminate unused variable compiler warning Aaro Koskinen
2010-12-20 21:50 ` [PATCH 02/13] sisfb: delete HAVE_CONFIG_H checks Aaro Koskinen
2010-12-20 21:50 ` [PATCH 03/13] sisfb: remove duplicate function declarations Aaro Koskinen
2010-12-20 21:50 ` Aaro Koskinen [this message]
2010-12-20 21:50 ` [PATCH 05/13] sisfb: replace inSISREG with SiS_GetRegByte Aaro Koskinen
2010-12-20 21:50 ` [PATCH 06/13] sisfb: replace outSISREG with SiS_SetRegByte Aaro Koskinen
2010-12-20 21:50 ` [PATCH 07/13] sisfb: replace inSISIDXREG with SiS_GetReg Aaro Koskinen
2010-12-20 21:50 ` [PATCH 08/13] sisfb: replace outSISIDXREG with SiS_SetReg Aaro Koskinen
2010-12-20 21:50 ` [PATCH 09/13] sisfb: replace orSISIDXREG with SiS_SetRegOR Aaro Koskinen
2010-12-20 21:50 ` [PATCH 10/13] sisfb: replace andSISIDXREG with SiS_SetRegAND Aaro Koskinen
2010-12-20 21:50 ` [PATCH 11/13] sisfb: replace setSISIDXREG with SiS_SetRegANDOR Aaro Koskinen
2010-12-20 21:50 ` [PATCH 12/13] sisfb: delete unused register I/O macros Aaro Koskinen
2010-12-20 21:50 ` [PATCH 13/13] sisfb: eliminate compiler warnings Aaro Koskinen
2010-12-22 4:00 ` [PATCH 00/13] Further sisfb cleanups 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-5-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).