Skip to content

L
linux
Commit f2aee30e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: c6xdigio: remove ReadByteFromHwPort() 

This CamelCase function is just a wrapper around inb(). Remove it.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5a20c4f
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 54 deletions
drivers/staging/comedi/drivers/c6xdigio.c
View file @ f2aee30e
...@@ -43,12 +43,6 @@ This driver will not work with a 2.4 kernel. ...@@ -43,12 +43,6 @@ This driver will not work with a 2.4 kernel.
#include "../comedidev.h" #include "../comedidev.h"
static u8 ReadByteFromHwPort(unsigned long addr)
{
u8 result = inb(addr);
return result;
}
static void WriteByteToHwPort(unsigned long addr, u8 val) static void WriteByteToHwPort(unsigned long addr, u8 val)
{ {
outb_p(val, addr); outb_p(val, addr);
...@@ -95,28 +89,28 @@ static void C6X_pwmInit(unsigned long baseAddr) ...@@ -95,28 +89,28 @@ static void C6X_pwmInit(unsigned long baseAddr)
int timeout = 0; int timeout = 0;
WriteByteToHwPort(baseAddr, 0x70); WriteByteToHwPort(baseAddr, 0x70);
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0) while (((inb(baseAddr + 1) & 0x80) == 0)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x74); WriteByteToHwPort(baseAddr, 0x74);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80) while (((inb(baseAddr + 1) & 0x80) == 0x80)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x70); WriteByteToHwPort(baseAddr, 0x70);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x0) while (((inb(baseAddr + 1) & 0x80) == 0x0)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x0); WriteByteToHwPort(baseAddr, 0x0);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80) while (((inb(baseAddr + 1) & 0x80) == 0x80)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
...@@ -143,47 +137,47 @@ static void C6X_pwmOutput(unsigned long baseAddr, unsigned channel, int value) ...@@ -143,47 +137,47 @@ static void C6X_pwmOutput(unsigned long baseAddr, unsigned channel, int value)
} /* endif */ } /* endif */
WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb0); WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb0);
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb1 + 0x4); WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb1 + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb2); WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb2);
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb3 + 0x4); WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb3 + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb4); WriteByteToHwPort(baseAddr, ppcmd + pwm.bits.sb4);
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x0); WriteByteToHwPort(baseAddr, 0x0);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
...@@ -203,82 +197,82 @@ static int C6X_encInput(unsigned long baseAddr, unsigned channel) ...@@ -203,82 +197,82 @@ static int C6X_encInput(unsigned long baseAddr, unsigned channel)
ppcmd = 0x50; ppcmd = 0x50;
WriteByteToHwPort(baseAddr, ppcmd); WriteByteToHwPort(baseAddr, ppcmd);
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb0 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb0 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd + 0x4); WriteByteToHwPort(baseAddr, ppcmd + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb1 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb1 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd); WriteByteToHwPort(baseAddr, ppcmd);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb2 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb2 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd + 0x4); WriteByteToHwPort(baseAddr, ppcmd + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb3 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb3 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd); WriteByteToHwPort(baseAddr, ppcmd);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb4 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb4 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd + 0x4); WriteByteToHwPort(baseAddr, ppcmd + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb5 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb5 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd); WriteByteToHwPort(baseAddr, ppcmd);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb6 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb6 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd + 0x4); WriteByteToHwPort(baseAddr, ppcmd + 0x4);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
enc.bits.sb7 = ((ReadByteFromHwPort(baseAddr + 1) >> 3) & 0x7); enc.bits.sb7 = ((inb(baseAddr + 1) >> 3) & 0x7);
WriteByteToHwPort(baseAddr, ppcmd); WriteByteToHwPort(baseAddr, ppcmd);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x0) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x0) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x0); WriteByteToHwPort(baseAddr, 0x0);
timeout = 0; timeout = 0;
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) { while (((tmp & 0x80) == 0x80) && (timeout < C6XDIGIO_TIME_OUT)) {
tmp = ReadByteFromHwPort(baseAddr + 1); tmp = inb(baseAddr + 1);
timeout++; timeout++;
} }
...@@ -290,25 +284,25 @@ static void C6X_encResetAll(unsigned long baseAddr) ...@@ -290,25 +284,25 @@ static void C6X_encResetAll(unsigned long baseAddr)
unsigned timeout = 0; unsigned timeout = 0;
WriteByteToHwPort(baseAddr, 0x68); WriteByteToHwPort(baseAddr, 0x68);
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0) while (((inb(baseAddr + 1) & 0x80) == 0)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x6C); WriteByteToHwPort(baseAddr, 0x6C);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80) while (((inb(baseAddr + 1) & 0x80) == 0x80)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x68); WriteByteToHwPort(baseAddr, 0x68);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x0) while (((inb(baseAddr + 1) & 0x80) == 0x0)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
WriteByteToHwPort(baseAddr, 0x0); WriteByteToHwPort(baseAddr, 0x0);
timeout = 0; timeout = 0;
while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80) while (((inb(baseAddr + 1) & 0x80) == 0x80)
&& (timeout < C6XDIGIO_TIME_OUT)) { && (timeout < C6XDIGIO_TIME_OUT)) {
timeout++; timeout++;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7