ixgbe: drop err_eeprom tag which is at same location as err_sw_init

The err_eeprom and err_sw_init tags both go to the same location.  So
instead of maintaining two tags this patch combines them so we only use
err_sw_init.

(cherry picked from commit 35937c055a691a125cf52343cd671f6190ae5b3b)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index e5b15fb69f67d325ea5436d7988bd7b366e1b496..a6041e9106b8f28eb564ebb793e07e07b44daa7c 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7810,7 +7810,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
                e_dev_err("The EEPROM Checksum Is Not Valid\n");
                err = -EIO;
-               goto err_eeprom;
+               goto err_sw_init;
        }
 
        memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
@@ -7819,7 +7819,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
                e_dev_err("invalid MAC address\n");
                err = -EIO;
-               goto err_eeprom;
+               goto err_sw_init;
        }
 
        setup_timer(&adapter->service_timer, &ixgbe_service_timer,
@@ -7966,7 +7966,6 @@ err_register:
        ixgbe_release_hw_control(adapter);
        ixgbe_clear_interrupt_scheme(adapter);
 err_sw_init:
-err_eeprom:
        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
                ixgbe_disable_sriov(adapter);
        adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;