1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 0ae1bcc6da73..e4a192b26423 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1094,10 +1094,10 @@ vmxnet3_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 
-                BUG_ON(skb->queue_mapping > adapter->num_tx_queues);
-                return vmxnet3_tq_xmit(skb,
-                                       &adapter->tx_queue[skb->queue_mapping],
-                                       adapter, netdev);
+        BUG_ON(skb->queue_mapping > adapter->num_tx_queues);
+        return vmxnet3_tq_xmit(skb,
+                               &adapter->tx_queue[skb->queue_mapping],
+                               adapter, netdev);
 }
 
 
@@ -1243,8 +1243,8 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
                         skb_reserve(new_skb, NET_IP_ALIGN);
                         rbi->skb = new_skb;
                         rbi->dma_addr = pci_map_single(adapter->pdev,
-                                        rbi->skb->data, rbi->len,
-                                        PCI_DMA_FROMDEVICE);
+                                                       rbi->skb->data, rbi->len,
+                                                       PCI_DMA_FROMDEVICE);
                         rxd->addr = cpu_to_le64(rbi->dma_addr);
                         rxd->len = rbi->len;
 
@@ -1331,14 +1331,14 @@ rcd_done:
                 /* if needed, update the register */
                 if (unlikely(rq->shared->updateRxProd)) {
                         VMXNET3_WRITE_BAR0_REG(adapter,
-                                rxprod_reg[ring_idx] + rq->qid * 8,
-                                ring->next2fill);
+                                               rxprod_reg[ring_idx] + rq->qid * 8,
+                                               ring->next2fill);
                         rq->uncommitted[ring_idx] = 0;
                 }
 
                 vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
                 vmxnet3_getRxComp(rcd,
-                     &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
+                                  &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
         }
 
         return num_rxd;
@@ -1922,7 +1922,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
                 free_irq(adapter->pdev->irq, adapter->netdev);
                 break;
         default:
-                BUG_ON(true);
+                BUG();
         }
 }
 
@@ -2949,11 +2949,11 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
         spin_lock_init(&adapter->cmd_lock);
         adapter->shared = pci_alloc_consistent(adapter->pdev,
-                          sizeof(struct Vmxnet3_DriverShared),
-                          &adapter->shared_pa);
+                                               sizeof(struct Vmxnet3_DriverShared),
+                                               &adapter->shared_pa);
         if (!adapter->shared) {
                 printk(KERN_ERR "Failed to allocate memory for %s\n",
-                        pci_name(pdev));
+                       pci_name(pdev));
                 err = -ENOMEM;
                 goto err_alloc_shared;
         }
@@ -2964,16 +2964,16 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         size = sizeof(struct Vmxnet3_TxQueueDesc) * adapter->num_tx_queues;
         size += sizeof(struct Vmxnet3_RxQueueDesc) * adapter->num_rx_queues;
         adapter->tqd_start = pci_alloc_consistent(adapter->pdev, size,
-                             &adapter->queue_desc_pa);
+                                                  &adapter->queue_desc_pa);
 
         if (!adapter->tqd_start) {
                 printk(KERN_ERR "Failed to allocate memory for %s\n",
-                        pci_name(pdev));
+                       pci_name(pdev));
                 err = -ENOMEM;
                 goto err_alloc_queue_desc;
         }
         adapter->rqd_start = (struct Vmxnet3_RxQueueDesc *)(adapter->tqd_start +
-                                                        adapter->num_tx_queues);
+                                                            adapter->num_tx_queues);
 
         adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
         if (adapter->pm_conf == NULL) {
@@ -3019,7 +3019,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
         adapter->dev_number = atomic_read(&devices_found);
 
-         adapter->share_intr = irq_share_mode;
+        adapter->share_intr = irq_share_mode;
         if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE &&
             adapter->num_tx_queues != adapter->num_rx_queues)
                 adapter->share_intr = VMXNET3_INTR_DONTSHARE;
@@ -3065,7 +3065,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
         if (err) {
                 printk(KERN_ERR "Failed to register adapter %s\n",
-                        pci_name(pdev));
+                       pci_name(pdev));
                 goto err_register;
         }