diff options
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 6da479b365c2..ed129f1c5c3e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -2022,7 +2022,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2022 | s32 ret_val; | 2022 | s32 ret_val; |
2023 | static int global_quad_port_a; /* global quad port a indication */ | 2023 | static int global_quad_port_a; /* global quad port a indication */ |
2024 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; | 2024 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; |
2025 | unsigned long mmio_start, mmio_len; | ||
2026 | int err, pci_using_dac; | 2025 | int err, pci_using_dac; |
2027 | u8 part_str[E1000_PBANUM_LENGTH]; | 2026 | u8 part_str[E1000_PBANUM_LENGTH]; |
2028 | 2027 | ||
@@ -2079,11 +2078,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2079 | hw->back = adapter; | 2078 | hw->back = adapter; |
2080 | adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE); | 2079 | adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE); |
2081 | 2080 | ||
2082 | mmio_start = pci_resource_start(pdev, 0); | ||
2083 | mmio_len = pci_resource_len(pdev, 0); | ||
2084 | |||
2085 | err = -EIO; | 2081 | err = -EIO; |
2086 | hw->hw_addr = ioremap(mmio_start, mmio_len); | 2082 | hw->hw_addr = pci_iomap(pdev, 0, 0); |
2087 | if (!hw->hw_addr) | 2083 | if (!hw->hw_addr) |
2088 | goto err_ioremap; | 2084 | goto err_ioremap; |
2089 | 2085 | ||
@@ -2093,8 +2089,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2093 | 2089 | ||
2094 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); | 2090 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); |
2095 | 2091 | ||
2096 | netdev->mem_start = mmio_start; | 2092 | netdev->mem_start = pci_resource_start(pdev, 0); |
2097 | netdev->mem_end = mmio_start + mmio_len; | 2093 | netdev->mem_end = pci_resource_end(pdev, 0); |
2098 | 2094 | ||
2099 | /* PCI config space info */ | 2095 | /* PCI config space info */ |
2100 | hw->vendor_id = pdev->vendor; | 2096 | hw->vendor_id = pdev->vendor; |