Signed-off-by: Alexey Dobriyan <[email protected]>
---
drivers/char/rio/rioboot.c | 25 +++++--------------------
drivers/char/rio/rioctrl.c | 12 ++----------
drivers/char/rio/rioinit.c | 27 +++++----------------------
drivers/char/rio/riointr.c | 12 +++---------
drivers/char/rio/rioparam.c | 24 ++++++------------------
drivers/char/rio/rioroute.c | 34 +++++++---------------------------
drivers/char/rio/riotable.c | 19 +++++--------------
drivers/char/rio/riotty.c | 3 +--
8 files changed, 34 insertions(+), 122 deletions(-)
--- a/drivers/char/rio/rioboot.c
+++ b/drivers/char/rio/rioboot.c
@@ -107,9 +107,7 @@ RIOAtVec2Ctrl[] =
** Load in the RTA boot code.
*/
int
-RIOBootCodeRTA(p, rbp)
-struct rio_info * p;
-struct DownLoad * rbp;
+RIOBootCodeRTA(struct rio_info *p, struct DownLoad *rbp)
{
int offset;
@@ -240,9 +238,7 @@ void rio_start_card_running (struct Host
** numbers have trouble understanding what they are doing here.
*/
int
-RIOBootCodeHOST(p, rbp)
-struct rio_info * p;
-register struct DownLoad *rbp;
+RIOBootCodeHOST(struct rio_info *p, register struct DownLoad *rbp)
{
register struct Host *HostP;
register caddr_t Cad;
@@ -654,11 +650,7 @@ register struct DownLoad *rbp;
** return 1. If we havent, then return 0.
*/
int
-RIOBootRup( p, Rup, HostP, PacketP)
-struct rio_info * p;
-uint Rup;
-struct Host *HostP;
-struct PKT *PacketP;
+RIOBootRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT *PacketP)
{
struct PktCmd *PktCmdP = (struct PktCmd *)PacketP->data;
struct PktCmd_M *PktReplyP;
@@ -1239,10 +1231,7 @@ static int RIOBootComplete( struct rio_i
** "boot/noboot" field in the rio.cf file.
*/
int
-RIOBootOk(p, HostP, RtaUniq)
-struct rio_info * p;
-struct Host * HostP;
-ulong RtaUniq;
+RIOBootOk(struct rio_info *p, struct Host *HostP, ulong RtaUniq)
{
int Entry;
uint HostUniq = HostP->UniqueNum;
@@ -1268,11 +1257,7 @@ ulong RtaUniq;
*/
void
-FillSlot(entry, entry2, RtaUniq, HostP)
-int entry;
-int entry2;
-uint RtaUniq;
-struct Host *HostP;
+FillSlot(int entry, int entry2, uint RtaUniq, struct Host *HostP)
{
int link;
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -151,12 +151,7 @@ static int copyout (caddr_t dp, int arg,
}
int
-riocontrol(p, dev, cmd, arg, su)
-struct rio_info * p;
-dev_t dev;
-int cmd;
-caddr_t arg;
-int su;
+riocontrol(struct rio_info *p, dev_t dev, int cmd, caddr_t arg, int su)
{
uint Host; /* leave me unsigned! */
uint port; /* and me! */
@@ -1754,10 +1749,7 @@ RIO_DEBUG_CTRL, if (su)
** Pre-emptive commands go on RUPs and are only one byte long.
*/
int
-RIOPreemptiveCmd(p, PortP, Cmd)
-struct rio_info * p;
-struct Port *PortP;
-uchar Cmd;
+RIOPreemptiveCmd(struct rio_info *p, struct Port *PortP, uchar Cmd)
{
struct CmdBlk *CmdBlkP;
struct PktCmd_M *PktCmdP;
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -314,11 +314,7 @@ int Base;
** bits > 0 indicates 16 bit operation.
*/
int
-RIOAssignAT(p, Base, virtAddr, mode)
-struct rio_info * p;
-int Base;
-caddr_t virtAddr;
-int mode;
+RIOAssignAT(struct rio_info *p, int Base, caddr_t virtAddr, int mode)
{
int bits;
struct DpRam *cardp = (struct DpRam *)virtAddr;
@@ -1043,11 +1039,7 @@ static uchar val[] = {
** Nothing too complicated, just enough to check it out.
*/
int
-RIOBoardTest(paddr, caddr, type, slot)
-paddr_t paddr;
-caddr_t caddr;
-uchar type;
-int slot;
+RIOBoardTest(paddr_t paddr, caddr_t caddr, uchar type, int slot)
{
struct DpRam *DpRam = (struct DpRam *)caddr;
char *ram[4];
@@ -1124,10 +1116,7 @@ int slot;
** to check that the data from the previous phase was retained.
*/
static int
-RIOScrub(op, ram, size)
-int op;
-BYTE * ram;
-int size;
+RIOScrub(int op, BYTE *ram, int size)
{
int off;
unsigned char oldbyte;
@@ -1458,10 +1447,7 @@ struct rio_info * p;
#endif
int
-RIODefaultName(p, HostP, UnitId)
-struct rio_info * p;
-struct Host * HostP;
-uint UnitId;
+RIODefaultName(struct rio_info *p, struct Host *HostP, uint UnitId)
{
#ifdef CHECK
CheckHost( Host );
@@ -1545,10 +1531,7 @@ caddr_t vaddr;
void
-RIOHostReset(Type, DpRamP, Slot)
-uint Type;
-volatile struct DpRam *DpRamP;
-uint Slot;
+RIOHostReset(uint Type, volatile struct DpRam *DpRamP, uint Slot)
{
/*
** Reset the Tpu
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
--- a/drivers/char/rio/riointr.c
+++ b/drivers/char/rio/riointr.c
@@ -101,8 +101,7 @@ static char *firstchars (char *p, int nc
#define INCR( P, I ) ((P) = (((P)+(I)) & p->RIOBufferMask))
/* Enable and start the transmission of packets */
void
-RIOTxEnable(en)
-char * en;
+RIOTxEnable(char *en)
{
struct Port * PortP;
struct rio_info *p;
@@ -192,10 +191,7 @@ static int RupIntr;
static int RxIntr;
static int TxIntr;
void
-RIOServiceHost(p, HostP, From)
-struct rio_info * p;
-struct Host *HostP;
-int From;
+RIOServiceHost(struct rio_info *p, struct Host *HostP, int From)
{
rio_spin_lock (&HostP->HostLock);
if ( (HostP->Flags & RUN_STATE) != RC_RUNNING ) {
@@ -551,9 +547,7 @@ int From;
** we return the ttySpl level that we re-locked at.
*/
static void
-RIOReceive(p, PortP)
-struct rio_info * p;
-struct Port * PortP;
+RIOReceive(struct rio_info *p, struct Port *PortP)
{
struct tty_struct *TtyP;
register ushort transCount;
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -158,11 +158,7 @@ static char *_rioparam_c_sccs_ = "@(#)ri
** tty lock must NOT have been previously acquired.
*/
int
-RIOParam(PortP, cmd, Modem, SleepFlag)
-struct Port *PortP;
-int cmd;
-int Modem;
-int SleepFlag;
+RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)
{
register struct tty_struct *TtyP;
int retval;
@@ -639,9 +635,7 @@ int SleepFlag;
** to by the TxAdd pointer has PKT_IN_USE clear in its address.
*/
int
-can_add_transmit(PktP, PortP)
-PKT **PktP;
-struct Port *PortP;
+can_add_transmit(PKT **PktP, struct Port *PortP)
{
register PKT *tp;
@@ -656,8 +650,7 @@ struct Port *PortP;
** packet pointer. You must wrap the pointer from the end back to the start.
*/
void
-add_transmit(PortP)
-struct Port *PortP;
+add_transmit(struct Port *PortP)
{
if (RWORD(*PortP->TxAdd) & PKT_IN_USE) {
rio_dprintk (RIO_DEBUG_PARAM, "add_transmit: Packet has been stolen!");
@@ -673,9 +666,7 @@ struct Port *PortP;
* free list
****************************************/
void
-put_free_end(HostP, PktP)
-struct Host *HostP;
-PKT *PktP;
+put_free_end(struct Host *HostP, PKT *PktP)
{
FREE_LIST *tmp_pointer;
ushort old_end, new_end;
@@ -716,9 +707,7 @@ PKT *PktP;
** then can_remove_receive() returns 0.
*/
int
-can_remove_receive(PktP, PortP)
-PKT **PktP;
-struct Port *PortP;
+can_remove_receive(PKT **PktP, struct Port *PortP)
{
if ( RWORD(*PortP->RxRemove) & PKT_IN_USE) {
*PktP = (PKT *)RIO_PTR(PortP->Caddr,
@@ -734,8 +723,7 @@ struct Port *PortP;
** be wrapped back to the start.
*/
void
-remove_receive(PortP)
-struct Port *PortP;
+remove_receive(struct Port *PortP)
{
WWORD( *PortP->RxRemove, RWORD(*PortP->RxRemove) & ~PKT_IN_USE );
PortP->RxRemove = (PortP->RxRemove == PortP->RxEnd) ? PortP->RxStart :
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -622,10 +622,7 @@ int RIORouteRup( struct rio_info *p, uin
void
-RIOFixPhbs(p, HostP, unit)
-struct rio_info *p;
-struct Host *HostP;
-uint unit;
+RIOFixPhbs(struct rio_info *p, struct Host *HostP, uint unit)
{
ushort link, port;
struct Port *PortP;
@@ -724,10 +721,7 @@ uint unit;
** only gets up-to-date information about what is going on.
*/
static int
-RIOCheckIsolated(p, HostP, UnitId)
-struct rio_info * p;
-struct Host *HostP;
-uint UnitId;
+RIOCheckIsolated(struct rio_info *p, struct Host *HostP, uint UnitId)
{
unsigned long flags;
rio_spin_lock_irqsave(&HostP->HostLock, flags);
@@ -754,10 +748,7 @@ uint UnitId;
** subnet will re-introduce itself.
*/
static int
-RIOIsolate(p, HostP, UnitId)
-struct rio_info * p;
-struct Host * HostP;
-uint UnitId;
+RIOIsolate(struct rio_info *p, struct Host *HostP, uint UnitId)
{
uint link, unit;
@@ -789,9 +780,7 @@ uint UnitId;
}
static int
-RIOCheck(HostP, UnitId)
-struct Host *HostP;
-uint UnitId;
+RIOCheck(struct Host *HostP, uint UnitId)
{
unsigned char link;
@@ -850,8 +839,7 @@ uint UnitId;
*/
uint
-GetUnitType(Uniq)
-uint Uniq;
+GetUnitType(uint Uniq)
{
switch ( (Uniq >> 28) & 0xf)
{
@@ -874,8 +862,7 @@ uint Uniq;
}
int
-RIOSetChange(p)
-struct rio_info * p;
+RIOSetChange(struct rio_info *p)
{
if ( p->RIOQuickCheck != NOT_CHANGED )
return(0);
@@ -890,14 +877,7 @@ struct rio_info * p;
}
static void
-RIOConCon(p, HostP, FromId, FromLink, ToId, ToLink, Change)
-struct rio_info * p;
-struct Host *HostP;
-uint FromId;
-uint FromLink;
-uint ToId;
-uint ToLink;
-int Change;
+RIOConCon(struct rio_info *p, struct Host *HostP, uint FromId, uint FromLink, uint ToId, uint ToLink, int Change)
{
char *FromName;
char *FromType;
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -92,8 +92,7 @@ static char *_riotable_c_sccs_ = "@(#)ri
** to sort it out and use the information contained therein.
*/
int
-RIONewTable(p)
-struct rio_info * p;
+RIONewTable(struct rio_info *p)
{
int Host, Host1, Host2, NameIsUnique, Entry, SubEnt;
struct Map *MapP;
@@ -435,8 +434,7 @@ struct rio_info * p;
** principles.
*/
int
-RIOApel(p)
-struct rio_info * p;
+RIOApel(struct rio_info *p)
{
int Host;
int link;
@@ -490,9 +488,7 @@ struct rio_info * p;
** it from the table.
*/
int
-RIODeleteRta(p, MapP)
-struct rio_info *p;
-struct Map *MapP;
+RIODeleteRta(struct rio_info *p, struct Map *MapP)
{
int host, entry, port, link;
int SysPort;
@@ -806,10 +802,7 @@ int RIOAssignRta( struct rio_info *p, st
int
-RIOReMapPorts(p, HostP, HostMapP)
-struct rio_info * p;
-struct Host *HostP;
-struct Map *HostMapP;
+RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP)
{
register struct Port *PortP;
uint SubEnt;
@@ -987,9 +980,7 @@ struct Map *HostMapP;
}
int
-RIOChangeName(p, MapP)
-struct rio_info *p;
-struct Map* MapP;
+RIOChangeName(struct rio_info *p, struct Map *MapP)
{
int host;
struct Map *HostMapP;
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -762,8 +762,7 @@ RIOCookMode(struct ttystatics *tp)
#endif
static void
-RIOClearUp(PortP)
-struct Port *PortP;
+RIOClearUp(struct Port *PortP)
{
rio_dprintk (RIO_DEBUG_TTY, "RIOHalted set\n");
PortP->Config = 0; /* Direct semaphore */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |