ixgbe: fix pci_resource allocation as in other drivers
Form: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Родитель
98c00a1c5d
Коммит
05857980cf
|
@ -3605,7 +3605,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
struct ixgbe_adapter *adapter = NULL;
|
||||
struct ixgbe_hw *hw;
|
||||
const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];
|
||||
unsigned long mmio_start, mmio_len;
|
||||
static int cards_found;
|
||||
int i, err, pci_using_dac;
|
||||
u16 link_status, link_speed, link_width;
|
||||
|
@ -3657,10 +3656,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
hw->back = adapter;
|
||||
adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
|
||||
|
||||
mmio_start = pci_resource_start(pdev, 0);
|
||||
mmio_len = pci_resource_len(pdev, 0);
|
||||
|
||||
hw->hw_addr = ioremap(mmio_start, mmio_len);
|
||||
hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
|
||||
pci_resource_len(pdev, 0));
|
||||
if (!hw->hw_addr) {
|
||||
err = -EIO;
|
||||
goto err_ioremap;
|
||||
|
@ -3690,9 +3687,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
#endif
|
||||
strcpy(netdev->name, pci_name(pdev));
|
||||
|
||||
netdev->mem_start = mmio_start;
|
||||
netdev->mem_end = mmio_start + mmio_len;
|
||||
|
||||
adapter->bd_number = cards_found;
|
||||
|
||||
/* PCI config space info */
|
||||
|
|
Загрузка…
Ссылка в новой задаче