etherlabmaster: comparison devices/e1000/e1000

equal deleted inserted replaced

-:aa0f6f939cb3
+:ca345abf0565
 	struct net_device *netdev = adapter->netdev;
 	irq_handler_t handler = e1000_intr;
 	int irq_flags = IRQF_SHARED;
 	int err;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return 0;
+	}
 	err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
 	                  netdev);
 	if (err) {
 		e_err(probe, "Unable to allocate interrupt Error: %d\n", err);
 static void e1000_free_irq(struct e1000_adapter *adapter)
 {
 	struct net_device *netdev = adapter->netdev;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return;
+	}
 	free_irq(adapter->pdev->irq, netdev);
 }
 /**
 static void e1000_irq_disable(struct e1000_adapter *adapter)
 {
 	struct e1000_hw *hw = &adapter->hw;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return;
+	}
 	ew32(IMC, ~0);
 	E1000_WRITE_FLUSH();
 	synchronize_irq(adapter->pdev->irq);
 }
 static void e1000_irq_enable(struct e1000_adapter *adapter)
 {
 	struct e1000_hw *hw = &adapter->hw;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return;
+	}
 	ew32(IMS, IMS_ENABLE_MASK);
 	E1000_WRITE_FLUSH();
 }
 }
 static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
 					     struct e1000_buffer *buffer_info)
 {
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return;
+	}
 	if (buffer_info->dma) {
 		if (buffer_info->mapped_as_page)
 			dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
 				       buffer_info->length, DMA_TO_DEVICE);
 			ew32(TCTL, tctl);
 			E1000_WRITE_FLUSH();
 			adapter->tx_fifo_head = 0;
 			atomic_set(&adapter->tx_fifo_stall, 0);
-			if (!adapter->ecdev) netif_wake_queue(netdev);
+			if (!adapter->ecdev) {
+				netif_wake_queue(netdev);
+			}
 		} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
-			if (!adapter->ecdev)
+			if (!adapter->ecdev) {
 				mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
+			}
 		}
 	}
 	rtnl_unlock();
 }
 	if (link) {
 		if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
 				|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
 			u32 ctrl;
-			bool txb2b = true;
+			bool txb2b __attribute__ ((unused)) = true;
 			/* update snapshot of PHY registers on LSC */
 			e1000_get_speed_and_duplex(hw,
 			                           &adapter->link_speed,
 			                           &adapter->link_duplex);
 	/* Cause software interrupt to ensure rx ring is cleaned */
 	ew32(ICS, E1000_ICS_RXDMT0);
 	/* Force detection of hung controller every watchdog period */
-	if (!adapter->ecdev) adapter->detect_tx_hung = true;
+	if (!adapter->ecdev) {
+		adapter->detect_tx_hung = true;
+	}
 	/* Reset the timer */
 	if (!adapter->ecdev) {
 		if (!test_bit(__E1000_DOWN, &adapter->flags))
 			mod_timer(&adapter->watchdog_timer,
 	 * if using multiple tx queues.  If the stack breaks away from a
 	 * single qdisc implementation, we can look at this again. */
 	tx_ring = adapter->tx_ring;
 	if (unlikely(skb->len <= 0)) {
-		if (!adapter->ecdev)
+		if (!adapter->ecdev) {
 			dev_kfree_skb_any(skb);
+		}
 		return NETDEV_TX_OK;
 	}
 	mss = skb_shinfo(skb)->gso_size;
 	/* The controller does a simple calculation to
 			/* Make sure there is space in the ring for the next send. */
 			e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
 		}
 	} else {
-		if (!adapter->ecdev) dev_kfree_skb_any(skb);
+		if (!adapter->ecdev) {
+			dev_kfree_skb_any(skb);
+		}
 		tx_ring->buffer_info[first].time_stamp = 0;
 		tx_ring->next_to_use = first;
 	}
 	return NETDEV_TX_OK;
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
 	int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return -EBUSY;
+	}
 	if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
 	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {
 		e_err(probe, "Invalid MTU setting\n");
 		return -EINVAL;
 	if (adapter->link_speed == 0)
 		return;
 	if (pci_channel_offline(pdev))
 		return;
-	if (!adapter->ecdev)
+	if (!adapter->ecdev) {
 		spin_lock_irqsave(&adapter->stats_lock, flags);
+	}
 	/* these counters are modified from e1000_tbi_adjust_stats,
 	 * called from the interrupt context, so they must only
 	 * be written while holding adapter->stats_lock
 	 */
 		adapter->stats.mgptc += er32(MGTPTC);
 		adapter->stats.mgprc += er32(MGTPRC);
 		adapter->stats.mgpdc += er32(MGTPDC);
 	}
-	if (!adapter->ecdev)
+	if (!adapter->ecdev) {
 		spin_unlock_irqrestore(&adapter->stats_lock, flags);
+	}
 }
 void ec_poll(struct net_device *netdev)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 		(*work_done)++;
 		rmb(); /* read descriptor and rx_buffer_info after status DD */
 		status = rx_desc->status;
 		skb = buffer_info->skb;
-		if (!adapter->ecdev) buffer_info->skb = NULL;
+		if (!adapter->ecdev) {
+			buffer_info->skb = NULL;
+		}
 		if (++i == rx_ring->count) i = 0;
 		next_rxd = E1000_RX_DESC(*rx_ring, i);
 		prefetch(next_rxd);
 		(*work_done)++;
 		rmb(); /* read descriptor and rx_buffer_info after status DD */
 		status = rx_desc->status;
 		skb = buffer_info->skb;
-		if (!adapter->ecdev) buffer_info->skb = NULL;
+		if (!adapter->ecdev) {
+			buffer_info->skb = NULL;
+		}
 		prefetch(skb->data - NET_IP_ALIGN);
 		if (++i == rx_ring->count) i = 0;
 		next_rxd = E1000_RX_DESC(*rx_ring, i);
 	switch (cmd) {
 	case SIOCGMIIPHY:
 		data->phy_id = hw->phy_addr;
 		break;
 	case SIOCGMIIREG:
-		if (adapter->ecdev) return -EPERM;
+		if (adapter->ecdev) {
+			return -EPERM;
+		}
 		spin_lock_irqsave(&adapter->stats_lock, flags);
 		if (e1000_read_phy_reg(hw, data->reg_num & 0x1F,
 				   &data->val_out)) {
 			spin_unlock_irqrestore(&adapter->stats_lock, flags);
 			return -EIO;
 		}
 		spin_unlock_irqrestore(&adapter->stats_lock, flags);
 		break;
 	case SIOCSMIIREG:
-		if (adapter->ecdev) return -EPERM;
+		if (adapter->ecdev) {
+			return -EPERM;
+		}
 		if (data->reg_num & ~(0x1F))
 			return -EFAULT;
 		mii_reg = data->val_in;
 		spin_lock_irqsave(&adapter->stats_lock, flags);
 		if (e1000_write_phy_reg(hw, data->reg_num,
 	u32 wufc = adapter->wol;
 #ifdef CONFIG_PM
 	int retval = 0;
 #endif
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return -EBUSY;
+	}
 	netif_device_detach(netdev);
 	if (netif_running(netdev)) {
 		WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
 	u32 err;
-	if (adapter->ecdev)
+	if (adapter->ecdev) {
 		return -EBUSY;
+	}
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
 	pci_save_state(pdev);
 	e1000_init_manageability(adapter);
 	if (netif_running(netdev))
 		e1000_up(adapter);
-	if (!adapter->ecdev) netif_device_attach(netdev);
+	if (!adapter->ecdev) {
+		netif_device_attach(netdev);
+	}
 	return 0;
 }
 #endif

branch	stable-1.5
changeset 2378	ca345abf0565
parent 2289	1c75f52e5c0f
child 2421	bc2d4bf9cbe5
child 2589	2b9c78543663