1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index a7b6888829b5..e3c42f5ac4a9 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -729,8 +729,8 @@ static void tms380tr_timer_chk(unsigned long data)
                 return;
 
         tms380tr_chk_outstanding_cmds(dev);
-        if(time_before(tp->LastSendTime + SEND_TIMEOUT, jiffies)
-                && (tp->TplFree != tp->TplBusy))
+        if(time_before(tp->LastSendTime + SEND_TIMEOUT, jiffies) &&
+           (tp->TplFree != tp->TplBusy))
         {
                 /* Anything to send, but stalled too long */
                 tp->LastSendTime = jiffies;
@@ -830,8 +830,8 @@ irqreturn_t tms380tr_interrupt(int irq, void *dev_id)
                 }
 
                 /* Reset system interrupt if not already done. */
-                if(irq_type != STS_IRQ_TRANSMIT_STATUS
-                        && irq_type != STS_IRQ_RECEIVE_STATUS) {
+                if(irq_type != STS_IRQ_TRANSMIT_STATUS &&
+                   irq_type != STS_IRQ_RECEIVE_STATUS) {
                         tms380tr_reset_interrupt(dev);
                 }
 
@@ -895,10 +895,10 @@ static unsigned char tms380tr_chk_ssb(struct net_local *tp, unsigned short IrqTy
 
         /* Check if this interrupt does use the SSB. */
 
-        if(IrqType != STS_IRQ_TRANSMIT_STATUS
-                && IrqType != STS_IRQ_RECEIVE_STATUS
-                && IrqType != STS_IRQ_COMMAND_STATUS
-                && IrqType != STS_IRQ_RING_STATUS)
+        if(IrqType != STS_IRQ_TRANSMIT_STATUS &&
+           IrqType != STS_IRQ_RECEIVE_STATUS &&
+           IrqType != STS_IRQ_COMMAND_STATUS &&
+           IrqType != STS_IRQ_RING_STATUS)
         {
                 return (1);     /* SSB not involved. */
         }
@@ -1364,6 +1364,8 @@ static int tms380tr_reset_adapter(struct net_device *dev)
         return (-1);
 }
 
+MODULE_FIRMWARE("tms380tr.bin");
+
 /*
  * Starts bring up diagnostics of token ring adapter and evaluates
  * diagnostic results.
@@ -1483,8 +1485,8 @@ static int tms380tr_init_adapter(struct net_device *dev)
                         /* Mask interesting status bits */
                         Status = SIFREADW(SIFSTS);
                         Status &= STS_MASK;
-                } while(((Status &(STS_INITIALIZE | STS_ERROR | STS_TEST)) != 0)
-                        && ((Status & STS_ERROR) == 0) && (loop_cnt != 0));
+                } while(((Status &(STS_INITIALIZE | STS_ERROR | STS_TEST)) != 0) &&
+                        ((Status & STS_ERROR) == 0) && (loop_cnt != 0));
 
                 if((Status & (STS_INITIALIZE | STS_ERROR | STS_TEST)) == 0)
                 {
@@ -2181,8 +2183,8 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
                                 }
                         }
 
-                        if(skb && (rpl->SkbStat == SKB_DATA_COPY
-                                || rpl->SkbStat == SKB_DMA_DIRECT))
+                        if(skb && (rpl->SkbStat == SKB_DATA_COPY ||
+                                   rpl->SkbStat == SKB_DMA_DIRECT))
                         {
                                 if(rpl->SkbStat == SKB_DATA_COPY)
                                         skb_copy_to_linear_data(skb, ReceiveDataPtr,