drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions

[pandora-kernel.git] / drivers / net / ethernet / intel / e1000e / netdev.c

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 623e30b..ca477e8 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2159,7 +2159,7 @@ void e1000e_release_hw_control(struct e1000_adapter *adapter)
 }
 
 /**
- * @e1000_alloc_ring - allocate memory for a ring structure
+ * e1000_alloc_ring_dma - allocate memory for a ring structure
  **/
 static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
                                struct e1000_ring *ring)
@@ -6191,7 +6191,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        }
 
        if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
-               e_info("PHY reset is blocked due to SOL/IDER session.\n");
+               dev_info(&pdev->dev,
+                        "PHY reset is blocked due to SOL/IDER session.\n");
 
        /* Set initial default active device features */
        netdev->features = (NETIF_F_SG |
@@ -6241,7 +6242,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                if (e1000_validate_nvm_checksum(&adapter->hw) >= 0)
                        break;
                if (i == 2) {
-                       e_err("The NVM Checksum Is Not Valid\n");
+                       dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
                        err = -EIO;
                        goto err_eeprom;
                }
@@ -6251,13 +6252,15 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
        /* copy the MAC address */
        if (e1000e_read_mac_addr(&adapter->hw))
-               e_err("NVM Read Error while reading MAC address\n");
+               dev_err(&pdev->dev,
+                       "NVM Read Error while reading MAC address\n");
 
        memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
        memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
        if (!is_valid_ether_addr(netdev->perm_addr)) {
-               e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
+               dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
+                       netdev->perm_addr);
                err = -EIO;
                goto err_eeprom;
        }