Merge with 2.4.0-test7.

1 files changed, 74 insertions, 74 deletions

diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index 2f13eb273..ab78ddf5d 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -178,8 +178,8 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 
     if ( Lies )
     {
-      rio_dprint(RIO_DEBUG_ROUTE, ("LIES! DAMN LIES! %d LIES!\n",Lies));
-      rio_dprint(RIO_DEBUG_ROUTE, ("%d:%c %d:%c %d:%c %d:%c\n",
+      rio_dprintk (RIO_DEBUG_ROUTE, "LIES! DAMN LIES! %d LIES!\n",Lies);
+      rio_dprintk (RIO_DEBUG_ROUTE, "%d:%c %d:%c %d:%c %d:%c\n",
           RBYTE(PktCmdP->RouteTopology[0].Unit), 
 	  'A'+RBYTE(PktCmdP->RouteTopology[0].Link),
           RBYTE(PktCmdP->RouteTopology[1].Unit),
@@ -187,7 +187,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
           RBYTE(PktCmdP->RouteTopology[2].Unit),
 	  'A'+RBYTE(PktCmdP->RouteTopology[2].Link),
           RBYTE(PktCmdP->RouteTopology[3].Unit),
-	  'A'+RBYTE(PktCmdP->RouteTopology[3].Link)));
+	  'A'+RBYTE(PktCmdP->RouteTopology[3].Link));
       return TRUE;
     }
 
@@ -219,11 +219,11 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	     NewUnit != ROUTE_NO_ID &&
 	     NewUnit != ROUTE_INTERCONNECT )
 	{
-	    rio_dprint(RIO_DEBUG_ROUTE, ("I have a link from %s %s to unit %d:%d - I don't like it.\n",
+	    rio_dprintk (RIO_DEBUG_ROUTE, "I have a link from %s %s to unit %d:%d - I don't like it.\n",
 		  MyType,
 		  MyName,
 		  NewUnit,
-		  NewLink));
+		  NewLink);
 	}
 	else
 	{
@@ -248,8 +248,8 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	    RIOConCon(p,HostP,ThisUnit,ThisLink,NewUnit,NewLink,CONNECT);
 
 	  if ( NewUnit == ROUTE_NO_ID )
-	    rio_dprint(RIO_DEBUG_ROUTE, ("%s %s (%c) is connected to an unconfigured unit.\n",
-		    MyType,MyName,'A'+ThisLink));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "%s %s (%c) is connected to an unconfigured unit.\n",
+		    MyType,MyName,'A'+ThisLink);
 
 	  if ( NewUnit == ROUTE_INTERCONNECT )
 	  {
@@ -267,14 +267,14 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	    if ( HostP->Topology[OldLink].Unit == ThisUnit &&
 		 HostP->Topology[OldLink].Link == ThisLink )
 	    {
-	      rio_dprint(RIO_DEBUG_ROUTE, ("SETTING HOST (%c) TO DISCONNECTED!\n", OldLink+'A'));
+	      rio_dprintk (RIO_DEBUG_ROUTE, "SETTING HOST (%c) TO DISCONNECTED!\n", OldLink+'A');
 	      HostP->Topology[OldLink].Unit = ROUTE_DISCONNECT;
 	      HostP->Topology[OldLink].Link = NO_LINK;
 	    }
 	    else
 	    {
-	      rio_dprint(RIO_DEBUG_ROUTE, ("HOST(%c) WAS NOT CONNECTED TO %s (%c)!\n",
-		    OldLink+'A',HostP->Mapping[ThisUnit-1].Name,ThisLink+'A'));
+	      rio_dprintk (RIO_DEBUG_ROUTE, "HOST(%c) WAS NOT CONNECTED TO %s (%c)!\n",
+		    OldLink+'A',HostP->Mapping[ThisUnit-1].Name,ThisLink+'A');
 	    }
 	  }
 	  else if ( OldUnit <= MAX_RUP )
@@ -282,29 +282,29 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	    if ( HostP->Mapping[OldUnit-1].Topology[OldLink].Unit == ThisUnit &&
 	         HostP->Mapping[OldUnit-1].Topology[OldLink].Link == ThisLink )
 	    {
-	      rio_dprint(RIO_DEBUG_ROUTE, ("SETTING RTA %s (%c) TO DISCONNECTED!\n",
-				   HostP->Mapping[OldUnit-1].Name,OldLink+'A'));
+	      rio_dprintk (RIO_DEBUG_ROUTE, "SETTING RTA %s (%c) TO DISCONNECTED!\n",
+				   HostP->Mapping[OldUnit-1].Name,OldLink+'A');
 	      HostP->Mapping[OldUnit-1].Topology[OldLink].Unit=ROUTE_DISCONNECT;
 	      HostP->Mapping[OldUnit-1].Topology[OldLink].Link=NO_LINK;
 	    }
 	    else
 	    {
-	      rio_dprint(RIO_DEBUG_ROUTE, ("RTA %s (%c) WAS NOT CONNECTED TO %s (%c)\n",
+	      rio_dprintk (RIO_DEBUG_ROUTE, "RTA %s (%c) WAS NOT CONNECTED TO %s (%c)\n",
 			    HostP->Mapping[OldUnit-1].Name,OldLink+'A',
-			    HostP->Mapping[ThisUnit-1].Name,ThisLink+'A'));
+			    HostP->Mapping[ThisUnit-1].Name,ThisLink+'A');
 	    }
 	  }
 	  if ( NewUnit == HOST_ID )
 	  {
-	    rio_dprint(RIO_DEBUG_ROUTE, ("MARKING HOST (%c) CONNECTED TO %s (%c)\n",
-				NewLink+'A',MyName,ThisLink+'A'));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "MARKING HOST (%c) CONNECTED TO %s (%c)\n",
+				NewLink+'A',MyName,ThisLink+'A');
 	    HostP->Topology[NewLink].Unit = ThisUnit;
 	    HostP->Topology[NewLink].Link = ThisLink;
 	  }
 	  else if ( NewUnit <= MAX_RUP )
 	  {
-	    rio_dprint(RIO_DEBUG_ROUTE, ("MARKING RTA %s (%c) CONNECTED TO %s (%c)\n",
-	      HostP->Mapping[NewUnit-1].Name,NewLink+'A',MyName,ThisLink+'A'));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "MARKING RTA %s (%c) CONNECTED TO %s (%c)\n",
+	      HostP->Mapping[NewUnit-1].Name,NewLink+'A',MyName,ThisLink+'A');
 	    HostP->Mapping[NewUnit-1].Topology[NewLink].Unit=ThisUnit;
 	    HostP->Mapping[NewUnit-1].Topology[NewLink].Link=ThisLink;
 	  }
@@ -321,8 +321,8 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
   */
   if ( RBYTE(PktCmdP->Command) != ROUTE_REQUEST )
   {
-    rio_dprint(RIO_DEBUG_ROUTE, ("Unknown command %d received on rup %d host %d ROUTE_RUP\n", 
-	   RBYTE(PktCmdP->Command),Rup,(int)HostP));
+    rio_dprintk (RIO_DEBUG_ROUTE, "Unknown command %d received on rup %d host %d ROUTE_RUP\n", 
+	   RBYTE(PktCmdP->Command),Rup,(int)HostP);
     return TRUE;
   }
       
@@ -336,7 +336,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
   */
   RtaType = GetUnitType(RtaUniq);
 
-  rio_dprint(RIO_DEBUG_ROUTE, ("Received a request for an ID for serial number %x\n", RtaUniq));
+  rio_dprintk (RIO_DEBUG_ROUTE, "Received a request for an ID for serial number %x\n", RtaUniq);
 
   Mod = RBYTE(PktCmdP->ModuleTypes);
   Mod1 = LONYBLE(Mod);
@@ -347,14 +347,14 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
     ** with 8 port, set 2nd ident in Mod2 to the same as Mod1.
     */
     Mod2 = Mod1;
-    rio_dprint(RIO_DEBUG_ROUTE, ("Backplane type is %s (all ports)\n",
-     p->RIOModuleTypes[Mod1].Name ));
+    rio_dprintk (RIO_DEBUG_ROUTE, "Backplane type is %s (all ports)\n",
+     p->RIOModuleTypes[Mod1].Name);
   }
   else
   {
     Mod2 = HINYBLE(Mod);
-    rio_dprint(RIO_DEBUG_ROUTE, ("Module types are %s (ports 0-3) and %s (ports 4-7)\n",
-     p->RIOModuleTypes[Mod1].Name, p->RIOModuleTypes[Mod2].Name ));
+    rio_dprintk (RIO_DEBUG_ROUTE, "Module types are %s (ports 0-3) and %s (ports 4-7)\n",
+     p->RIOModuleTypes[Mod1].Name, p->RIOModuleTypes[Mod2].Name);
   }
 
   if ( RtaUniq == 0xffffffff )
@@ -367,7 +367,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
   */
   if ( !(CmdBlkP = RIOGetCmdBlk()) )
   {
-    rio_dprint(RIO_DEBUG_ROUTE, ("No command blocks to route RTA! come back later.\n"));
+    rio_dprintk (RIO_DEBUG_ROUTE, "No command blocks to route RTA! come back later.\n");
     return 0;
   }
 
@@ -384,8 +384,8 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 
   if (! RIOBootOk(p, HostP, RtaUniq))
   {
-    rio_dprint(RIO_DEBUG_ROUTE, ("RTA %x tried to get an ID, but does not belong - FOAD it!\n",
-	  RtaUniq));
+    rio_dprintk (RIO_DEBUG_ROUTE, "RTA %x tried to get an ID, but does not belong - FOAD it!\n",
+	  RtaUniq);
     PktReplyP->Command = ROUTE_FOAD;
     HostP->Copy("RT_FOAD", PktReplyP->CommandText, 7);
     RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
@@ -397,13 +397,13 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
   */
   for ( ThisUnit=0; ThisUnit<MAX_RUP; ThisUnit++ )
   {
-    rio_dprint(RIO_DEBUG_ROUTE, ("Entry %d Flags=%s %s UniqueNum=0x%x\n",
+    rio_dprintk (RIO_DEBUG_ROUTE, "Entry %d Flags=%s %s UniqueNum=0x%x\n",
 			ThisUnit,
 			HostP->Mapping[ThisUnit].Flags & SLOT_IN_USE ?
 					    "Slot-In-Use":"Not In Use",
 			HostP->Mapping[ThisUnit].Flags & SLOT_TENTATIVE ? 
 					    "Slot-Tentative":"Not Tentative",
-			HostP->Mapping[ThisUnit].RtaUniqueNum ));
+			HostP->Mapping[ThisUnit].RtaUniqueNum);
 
     /*
     ** We have an entry for it.
@@ -414,12 +414,12 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
       if (RtaType == TYPE_RTA16)
       {
 	  ThisUnit2 = HostP->Mapping[ThisUnit].ID2 - 1;
-          rio_dprint(RIO_DEBUG_ROUTE, ("Found unit 0x%x at slots %d+%d\n",
-					    RtaUniq,ThisUnit,ThisUnit2));
+          rio_dprintk (RIO_DEBUG_ROUTE, "Found unit 0x%x at slots %d+%d\n",
+					    RtaUniq,ThisUnit,ThisUnit2);
       }
       else
-          rio_dprint(RIO_DEBUG_ROUTE, ("Found unit 0x%x at slot %d\n",
-					    RtaUniq,ThisUnit));
+          rio_dprintk (RIO_DEBUG_ROUTE, "Found unit 0x%x at slot %d\n",
+					    RtaUniq,ThisUnit);
       /*
       ** If we have no knowledge of booting it, then the host has
       ** been re-booted, and so we must kill the RTA, so that it
@@ -458,14 +458,14 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	    */
 	    RIOFixPhbs(p, HostP, ThisUnit2);
 	    PktReplyP->IDNum2  = ThisUnit2+1;
-	    rio_dprint(RIO_DEBUG_ROUTE, ("RTA '%s' has been allocated IDs %d+%d\n",
-	          HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum, PktReplyP->IDNum2));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "RTA '%s' has been allocated IDs %d+%d\n",
+	          HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum, PktReplyP->IDNum2);
       }
       else
       {
 	    PktReplyP->IDNum2 = ROUTE_NO_ID;
-	    rio_dprint(RIO_DEBUG_ROUTE, ("RTA '%s' has been allocated ID %d\n",
-	          HostP->Mapping[ThisUnit].Name,PktReplyP->IDNum));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "RTA '%s' has been allocated ID %d\n",
+	          HostP->Mapping[ThisUnit].Name,PktReplyP->IDNum);
       }
       HostP->Copy("RT_ALLOCAT",PktReplyP->CommandText,10);
 
@@ -489,7 +489,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	  PortP = p->RIOPortp[port+HostP->Mapping[ThisUnit].SysPort];
 	  if ( PortP->State & (RIO_MOPEN|RIO_LOPEN) )
 	  {
-	    rio_dprint(RIO_DEBUG_ROUTE, ("Re-opened this port\n"));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "Re-opened this port\n");
 	    rio_spin_lock_irqsave(&PortP->portSem, flags);
 	    PortP->MagicFlags |= MAGIC_REBOOT;
 	    rio_spin_unlock_irqrestore(&PortP->portSem, flags);
@@ -502,7 +502,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP
 	    PortP = p->RIOPortp[port+HostP->Mapping[ThisUnit2].SysPort];
 	    if ( PortP->State & (RIO_MOPEN|RIO_LOPEN) )
 	    {
-	      rio_dprint(RIO_DEBUG_ROUTE, ("Re-opened this port\n"));
+	      rio_dprintk (RIO_DEBUG_ROUTE, "Re-opened this port\n");
 	      rio_spin_lock_irqsave(&PortP->portSem, flags);
 	      PortP->MagicFlags |= MAGIC_REBOOT;
 	      rio_spin_unlock_irqrestore(&PortP->portSem, flags);
@@ -628,7 +628,7 @@ uint unit;
 	unsigned long flags;
 	int PortN = HostP->Mapping[unit].SysPort;
 
-	rio_dprint(RIO_DEBUG_ROUTE, ("RIOFixPhbs unit %d sysport %d\n", unit, PortN));
+	rio_dprintk (RIO_DEBUG_ROUTE, "RIOFixPhbs unit %d sysport %d\n", unit, PortN);
 
 	if (PortN != -1) {
 		ushort		dest_unit = HostP->Mapping[unit].ID2;
@@ -656,7 +656,7 @@ uint unit;
 			** unset, so go no further.
 			*/
 			if (PortP->TxStart == 0) {
-					rio_dprint(RIO_DEBUG_ROUTE, ("Tx pkts not set up yet\n"));
+					rio_dprintk (RIO_DEBUG_ROUTE, "Tx pkts not set up yet\n");
 					break;
 			}
 
@@ -691,10 +691,10 @@ uint unit;
 				WBYTE(Pkt->dest_unit, dest_unit);
 				WBYTE(Pkt->dest_port, dest_port);
 			}
-			rio_dprint(RIO_DEBUG_ROUTE, ("phb dest: Old %x:%x New %x:%x\n",
+			rio_dprintk (RIO_DEBUG_ROUTE, "phb dest: Old %x:%x New %x:%x\n",
 					RWORD(PortP->PhbP->destination) & 0xff,
 					(RWORD(PortP->PhbP->destination) >> 8) & 0xff,
-					dest_unit, dest_port));
+					dest_unit, dest_port);
 			WWORD(PortP->PhbP->destination, dest_unit + (dest_port << 8));
 			WWORD(PortP->PhbP->link, link);
 
@@ -706,7 +706,7 @@ uint unit;
 		*/
 		if (link > 3) return;
 		if (((unit * 8) + 7) > RWORD(HostP->LinkStrP[link].last_port)) {
-			rio_dprint(RIO_DEBUG_ROUTE, ("last port on host link %d: %d\n", link, (unit * 8) + 7));
+			rio_dprintk (RIO_DEBUG_ROUTE, "last port on host link %d: %d\n", link, (unit * 8) + 7);
 			WWORD(HostP->LinkStrP[link].last_port, (unit * 8) + 7);
 		}
 	}
@@ -732,7 +732,7 @@ uint UnitId;
 	CheckUnitId( UnitId );
 #endif
 	if ( RIOCheck( HostP, UnitId ) ) {
-		rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d is NOT isolated\n",UnitId));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Unit %d is NOT isolated\n", UnitId);
 		rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
 		return(0);
 	}
@@ -771,7 +771,7 @@ uint UnitId;
 	HostP->Mapping[UnitId].Flags |= BEEN_HERE;
 
 	if ( p->RIOPrintDisabled == DO_PRINT )
-		rio_dprint(RIO_DEBUG_ROUTE, ("RIOMesgIsolated %s",HostP->Mapping[UnitId].Name));
+		rio_dprintk (RIO_DEBUG_ROUTE, "RIOMesgIsolated %s", HostP->Mapping[UnitId].Name);
 
 	for ( link=0; link<LINKS_PER_UNIT; link++) {
 		unit = HostP->Mapping[UnitId].Topology[link].Unit;
@@ -795,7 +795,7 @@ uint UnitId;
 	CheckUnitId( UnitId );
 #endif
 /* 	rio_dprint(RIO_DEBUG_ROUTE, ("Check to see if unit %d has a route to the host\n",UnitId)); */
-	rio_dprint(RIO_DEBUG_ROUTE, ("RIOCheck : UnitID = %d\n",UnitId));
+	rio_dprintk (RIO_DEBUG_ROUTE, "RIOCheck : UnitID = %d\n", UnitId);
 
 	if ( UnitId == HOST_ID ) {
 		/* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d is NOT isolated - it IS the host!\n", UnitId)); */
@@ -854,16 +854,16 @@ uint Uniq;
 		case RIO_MCA:
 		case RIO_EISA:
 		case RIO_PCI:
-			rio_dprint(RIO_DEBUG_ROUTE, ("Unit type: Host\n"));
+			rio_dprintk (RIO_DEBUG_ROUTE, "Unit type: Host\n");
 			return(TYPE_HOST);
 		case RIO_RTA_16:
-			rio_dprint(RIO_DEBUG_ROUTE, ("Unit type: 16 port RTA\n"));
+			rio_dprintk (RIO_DEBUG_ROUTE, "Unit type: 16 port RTA\n");
 			return(TYPE_RTA16);
 		case RIO_RTA:
-			rio_dprint(RIO_DEBUG_ROUTE, ("Unit type: 8 port RTA\n"));
+			rio_dprintk (RIO_DEBUG_ROUTE, "Unit type: 8 port RTA\n");
 			return(TYPE_RTA8);
 		default :
-			rio_dprint(RIO_DEBUG_ROUTE, ("Unit type: Unrecognised\n"));
+			rio_dprintk (RIO_DEBUG_ROUTE, "Unit type: Unrecognised\n");
 			return(99);
 	}
 }
@@ -876,7 +876,7 @@ struct rio_info *	p;
 		return(0);
 	p->RIOQuickCheck = CHANGED;
 	if ( p->RIOSignalProcess ) {
-		rio_dprint(RIO_DEBUG_ROUTE, ("Send SIG-HUP"));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Send SIG-HUP");
 		/*
 		psignal( RIOSignalProcess, SIGHUP );
 		*/
@@ -951,10 +951,10 @@ int Change;
     ToName = ToId ? HostP->Mapping[ToId-1].Name : HostP->Name;
     ToType = ToId ? "RTA" : "HOST";
 
-    rio_dprint(RIO_DEBUG_ROUTE, ("Link between %s '%s' (%c) and %s '%s' (%c) %s.\n",
+    rio_dprintk (RIO_DEBUG_ROUTE, "Link between %s '%s' (%c) and %s '%s' (%c) %s.\n",
 			    FromType, FromName, 'A'+FromLink,
 			    ToType,   ToName,   'A'+ToLink,
-			    (Change==CONNECT) ? "established" : "disconnected"));
+			    (Change==CONNECT) ? "established" : "disconnected");
     cprintf("Link between %s '%s' (%c) and %s '%s' (%c) %s.\n",
 			    FromType, FromName, 'A'+FromLink,
 			    ToType,   ToName,   'A'+ToLink,
@@ -1000,7 +1000,7 @@ RIOFreeDisconnected(struct rio_info *p, struct Host *HostP, int unit)
     int		link;
 
 
-    rio_dprint(RIO_DEBUG_ROUTE, ("RIOFreeDisconnect unit %d\n",unit));
+    rio_dprintk (RIO_DEBUG_ROUTE, "RIOFreeDisconnect unit %d\n", unit);
     /*
     ** If the slot is tentative and does not belong to the
     ** second half of a 16 port RTA then scan to see if
@@ -1023,17 +1023,17 @@ RIOFreeDisconnected(struct rio_info *p, struct Host *HostP, int unit)
     ** made this slot tentative and not yet received a topology update.
     ** Lets check how long ago we made it tentative.
     */
-    rio_dprint(RIO_DEBUG_ROUTE, ("Just about to check LBOLT on entry %d\n",unit));
+    rio_dprintk (RIO_DEBUG_ROUTE, "Just about to check LBOLT on entry %d\n", unit);
     if (drv_getparm(LBOLT, (ulong_t *) &current_time))
-        rio_dprint(RIO_DEBUG_ROUTE, ("drv_getparm(LBOLT,....) Failed.\n"));
+        rio_dprintk (RIO_DEBUG_ROUTE, "drv_getparm(LBOLT,....) Failed.\n");
 
     elapse_time = current_time - TentTime[unit];
-    rio_dprint(RIO_DEBUG_ROUTE, ("elapse %d = current %d - tent %d (%d usec)\n",
-        elapse_time, current_time, TentTime[unit],drv_hztousec(elapse_time)));
+    rio_dprintk (RIO_DEBUG_ROUTE, "elapse %d = current %d - tent %d (%d usec)\n",
+        elapse_time, current_time, TentTime[unit], drv_hztousec(elapse_time));
     if (drv_hztousec(elapse_time) < WAIT_TO_FINISH)
     {
-        rio_dprint(RIO_DEBUG_ROUTE, ("Skipping slot %d, not timed out yet %d\n"
-            ,unit,drv_hztousec(elapse_time)));
+      rio_dprintk (RIO_DEBUG_ROUTE, "Skipping slot %d, not timed out yet %d\n",
+            unit, drv_hztousec(elapse_time));
         return 1;
     }
 #endif
@@ -1046,7 +1046,7 @@ RIOFreeDisconnected(struct rio_info *p, struct Host *HostP, int unit)
     {
 	int nOther = (HostP->Mapping[unit].ID2) -1;
 
-	rio_dprint(RIO_DEBUG_ROUTE, ("RioFreedis second slot %d.\n",nOther));
+	rio_dprintk (RIO_DEBUG_ROUTE, "RioFreedis second slot %d.\n", nOther);
 	bzero((caddr_t)&HostP->Mapping[nOther], sizeof(struct Map));
     }
     RIORemoveFromSavedTable(p, &HostP->Mapping[unit]);
@@ -1082,19 +1082,19 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
     */
     for (unit = 0; unit < MAX_RUP; unit++)
     {
-	rio_dprint(RIO_DEBUG_ROUTE, ("Scanning unit %d\n",unit));
+	rio_dprintk (RIO_DEBUG_ROUTE, "Scanning unit %d\n",unit);
 	/*
 	** If the flags are zero then the slot is empty.
 	*/
 	if (HostP->Mapping[unit].Flags == 0)
 	{
-	    rio_dprint(RIO_DEBUG_ROUTE, ("      This slot is empty.\n"));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "      This slot is empty.\n");
 	    /*
 	    ** If we haven't allocated the first ID then do it now.
 	    */
 	    if (*pID1 == MAX_RUP)
 	    {
-		rio_dprint(RIO_DEBUG_ROUTE, ("Make tentative entry for first unit %d\n", unit));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Make tentative entry for first unit %d\n", unit);
 		*pID1 = unit;
 
 		/*
@@ -1109,7 +1109,7 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
 		/*
 		** Allocate the second slot and return.
 		*/
-		rio_dprint(RIO_DEBUG_ROUTE, ("Make tentative entry for second unit %d\n", unit));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Make tentative entry for second unit %d\n", unit);
 		*pID2 = unit;
 		return 0;
 	    }
@@ -1121,18 +1121,18 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
     ** need to start all over again looking for tentative slots
     ** that we can re-use.
     */
-    rio_dprint(RIO_DEBUG_ROUTE, ("Starting to scan for tentative slots\n"));
+    rio_dprintk (RIO_DEBUG_ROUTE, "Starting to scan for tentative slots\n");
     for (unit = 0; unit < MAX_RUP; unit++)
     {
 	if (((HostP->Mapping[unit].Flags & SLOT_TENTATIVE) ||
 	                       (HostP->Mapping[unit].Flags == 0))  && ! 
 	   (HostP->Mapping[unit].Flags & RTA16_SECOND_SLOT ))
 	{
-	    rio_dprint(RIO_DEBUG_ROUTE, ("    Slot %d looks promising.\n",unit));
+	    rio_dprintk (RIO_DEBUG_ROUTE, "    Slot %d looks promising.\n",unit);
 
 	    if(unit == *pID1)
 	    {
-	    	rio_dprint(RIO_DEBUG_ROUTE, ("    No it isn't, its the 1st half\n"));
+	    	rio_dprintk (RIO_DEBUG_ROUTE, "    No it isn't, its the 1st half\n");
 		continue;
 	    }
 
@@ -1152,7 +1152,7 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
 	    */
 	    if (*pID1 == MAX_RUP)
 	    {
-		rio_dprint(RIO_DEBUG_ROUTE, ("Grab tentative entry for first unit %d\n", unit));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Grab tentative entry for first unit %d\n", unit);
 		*pID1 = unit;
 
 		/*
@@ -1172,8 +1172,8 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
 		/*
 		** Allocate the second slot and return.
 		*/
-		rio_dprint(RIO_DEBUG_ROUTE, ("Grab tentative/empty  entry for second unit %d\n",
-		      unit));
+		rio_dprintk (RIO_DEBUG_ROUTE, "Grab tentative/empty  entry for second unit %d\n",
+		      unit);
 		*pID2 = unit;
 
 		/*
@@ -1190,7 +1190,7 @@ RIOFindFreeID(struct rio_info *p, struct Host *HostP, uint *pID1, uint *pID2)
 
 		if (*pID1 > *pID2)
 		{
-			rio_dprint(RIO_DEBUG_ROUTE, ("Swapping IDS %d %d\n",*pID1,*pID2));
+			rio_dprintk (RIO_DEBUG_ROUTE, "Swapping IDS %d %d\n", *pID1, *pID2);
 			tempID = *pID1;
 			*pID1 = *pID2;
 			*pID2 = tempID;