[2.6 patch] drivers/char/rio/: fix warnings with -Wundef

[Adrian Bunk]

This patch fixes the following warnings with -Wundef:

<--  snip  -->

...
  CC      drivers/char/rio/rioboot.o
drivers/char/rio/rioboot.c:905:5: warning: "NEED_TO_FIX" is not defined
drivers/char/rio/rioboot.c:921:5: warning: "NEED_TO_FIX" is not defined
drivers/char/rio/rioboot.c:1146:5: warning: "NEED_TO_FIX" is not defined
drivers/char/rio/rioboot.c:1162:5: warning: "NEED_TO_FIX" is not defined
drivers/char/rio/rioboot.c:1172:5: warning: "NEED_TO_FIX" is not defined
drivers/char/rio/rioboot.c:1191:5: warning: "NEED_TO_FIX" is not defined
...
  CC      drivers/char/rio/rioroute.o
drivers/char/rio/rioroute.c:1026:5: warning: "NEED_TO_FIX_THIS" is not defined
  CC      drivers/char/rio/riotable.o
...
drivers/char/rio/riotable.c:774:5: warning: "NEED_TO_FIX" is not defined
...

<--  snip  -->


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 drivers/char/rio/rioboot.c  |   12 ++++++------
 drivers/char/rio/rioroute.c |    2 +-
 drivers/char/rio/riotable.c |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

--- linux-2.6.13-rc3-mm1-full/drivers/char/rio/rioboot.c.old	2005-07-22 18:18:07.000000000 +0200
+++ linux-2.6.13-rc3-mm1-full/drivers/char/rio/rioboot.c	2005-07-22 18:47:35.000000000 +0200
@@ -902,7 +902,7 @@
 	       (HostP->Mapping[entry].RtaUniqueNum==RtaUniq))
 	    {
 	        HostP->Mapping[entry].Flags |= RTA_BOOTED|RTA_NEWBOOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 		RIO_SV_BROADCAST(HostP->svFlags[entry]);
 #endif
 		if ( (sysport=HostP->Mapping[entry].SysPort) != NO_PORT )
@@ -918,7 +918,7 @@
 		   {
 			entry2 = HostP->Mapping[entry].ID2 - 1;
 			HostP->Mapping[entry2].Flags |= RTA_BOOTED|RTA_NEWBOOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 			RIO_SV_BROADCAST(HostP->svFlags[entry2]);
 #endif
 			sysport = HostP->Mapping[entry2].SysPort;
@@ -1143,7 +1143,7 @@
 		    CCOPY( MapP->Name, HostP->Mapping[entry].Name, MAX_NAME_LEN );
 		    HostP->Mapping[entry].Flags =
 		     SLOT_IN_USE | RTA_BOOTED | RTA_NEWBOOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 		    RIO_SV_BROADCAST(HostP->svFlags[entry]);
 #endif
 		    RIOReMapPorts( p, HostP, &HostP->Mapping[entry] );
@@ -1159,7 +1159,7 @@
    "This RTA has a tentative entry on another host - delete that entry (1)\n");
 		    HostP->Mapping[entry].Flags =
 		     SLOT_TENTATIVE | RTA_BOOTED | RTA_NEWBOOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 		    RIO_SV_BROADCAST(HostP->svFlags[entry]);
 #endif
 		}
@@ -1169,7 +1169,7 @@
 		    {
 			HostP->Mapping[entry2].Flags = SLOT_IN_USE |
 			 RTA_BOOTED | RTA_NEWBOOT | RTA16_SECOND_SLOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 			RIO_SV_BROADCAST(HostP->svFlags[entry2]);
 #endif
 			HostP->Mapping[entry2].SysPort = MapP2->SysPort;
@@ -1188,7 +1188,7 @@
 		    else
 			HostP->Mapping[entry2].Flags = SLOT_TENTATIVE |
 			 RTA_BOOTED | RTA_NEWBOOT | RTA16_SECOND_SLOT;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 			RIO_SV_BROADCAST(HostP->svFlags[entry2]);
 #endif
 		    bzero( (caddr_t)MapP2, sizeof(struct Map) );
--- linux-2.6.13-rc3-mm1-full/drivers/char/rio/rioroute.c.old	2005-07-22 18:18:37.000000000 +0200
+++ linux-2.6.13-rc3-mm1-full/drivers/char/rio/rioroute.c	2005-07-22 18:18:43.000000000 +0200
@@ -1023,7 +1023,7 @@
     if (link < LINKS_PER_UNIT)
 	    return 1;
 
-#if NEED_TO_FIX_THIS
+#ifdef NEED_TO_FIX_THIS
     /* Ok so all the links are disconnected. But we may have only just
     ** made this slot tentative and not yet received a topology update.
     ** Lets check how long ago we made it tentative.
--- linux-2.6.13-rc3-mm1-full/drivers/char/rio/riotable.c.old	2005-07-22 18:18:51.000000000 +0200
+++ linux-2.6.13-rc3-mm1-full/drivers/char/rio/riotable.c	2005-07-22 18:18:55.000000000 +0200
@@ -771,7 +771,7 @@
 	    if ((MapP->Flags & RTA16_SECOND_SLOT) == 0)
 	      CCOPY( MapP->Name, HostMapP->Name, MAX_NAME_LEN );
 	    HostMapP->Flags = SLOT_IN_USE | RTA_BOOTED;
-#if NEED_TO_FIX
+#ifdef NEED_TO_FIX
 	    RIO_SV_BROADCAST(p->RIOHosts[host].svFlags[MapP->ID-1]);
 #endif
 	    if (MapP->Flags & RTA16_SECOND_SLOT)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/