1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index bf36959fc121..7b96e0814887 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -417,7 +417,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
         PortP = p->RIOPortp[SysPort];
         rio_spin_lock_irqsave(&PortP->portSem, flags);
         switch (readb(&PktCmdP->Command)) {
-        case BREAK_RECEIVED:
+        case RIOC_BREAK_RECEIVED:
                 rio_dprintk(RIO_DEBUG_CMD, "Received a break!\n");
                 /* If the current line disc. is not multi-threading and
                    the current processor is not the default, reset rup_intr
@@ -428,16 +428,16 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                 gs_got_break(&PortP->gs);
                 break;
 
-        case COMPLETE:
+        case RIOC_COMPLETE:
                 rio_dprintk(RIO_DEBUG_CMD, "Command complete on phb %d host %Zd\n", readb(&PktCmdP->PhbNum), HostP - p->RIOHosts);
                 subCommand = 1;
                 switch (readb(&PktCmdP->SubCommand)) {
-                case MEMDUMP:
+                case RIOC_MEMDUMP:
                         rio_dprintk(RIO_DEBUG_CMD, "Memory dump cmd (0x%x) from addr 0x%x\n", readb(&PktCmdP->SubCommand), readw(&PktCmdP->SubAddr));
                         break;
-                case READ_REGISTER:
+                case RIOC_READ_REGISTER:
                         rio_dprintk(RIO_DEBUG_CMD, "Read register (0x%x)\n", readw(&PktCmdP->SubAddr));
-                        p->CdRegister = (readb(&PktCmdP->ModemStatus) & MSVR1_HOST);
+                        p->CdRegister = (readb(&PktCmdP->ModemStatus) & RIOC_MSVR1_HOST);
                         break;
                 default:
                         subCommand = 0;
@@ -456,14 +456,15 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                         rio_dprintk(RIO_DEBUG_CMD, "No change\n");
 
                 /* FALLTHROUGH */
-        case MODEM_STATUS:
+        case RIOC_MODEM_STATUS:
                 /*
                  ** Knock out the tbusy and tstop bits, as these are not relevant
                  ** to the check for modem status change (they're just there because
                  ** it's a convenient place to put them!).
                  */
                 ReportedModemStatus = readb(&PktCmdP->ModemStatus);
-                if ((PortP->ModemState & MSVR1_HOST) == (ReportedModemStatus & MSVR1_HOST)) {
+                if ((PortP->ModemState & RIOC_MSVR1_HOST) ==
+                                (ReportedModemStatus & RIOC_MSVR1_HOST)) {
                         rio_dprintk(RIO_DEBUG_CMD, "Modem status unchanged 0x%x\n", PortP->ModemState);
                         /*
                          ** Update ModemState just in case tbusy or tstop states have
@@ -497,7 +498,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                                         /*
                                          ** Is there a carrier?
                                          */
-                                        if (PortP->ModemState & MSVR1_CD) {
+                                        if (PortP->ModemState & RIOC_MSVR1_CD) {
                                                 /*
                                                  ** Has carrier just appeared?
                                                  */
@@ -691,7 +692,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)
                                  */
                                 rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
                                 FreeMe = RIOCommandRup(p, Rup, HostP, PacketP);
-                                if (readb(&PacketP->data[5]) == MEMDUMP) {
+                                if (readb(&PacketP->data[5]) == RIOC_MEMDUMP) {
                                         rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", readw(&(PacketP->data[6])));
                                         rio_memcpy_fromio(p->RIOMemDump, &(PacketP->data[8]), 32);
                                 }