diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-09-11 22:57:00 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:54:53 -0400 |
commit | 05857980cf15d96dd9eb47dd444b0634f436ba34 (patch) | |
tree | 4a428cbe34b362c243872ce259c5ededaf82e0a5 | |
parent | 98c00a1c5de23295aebe7e46a61d85e05ee82855 (diff) |
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>
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 2c8895e9daed..0269115593e3 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3605,7 +3605,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3605 | struct ixgbe_adapter *adapter = NULL; | 3605 | struct ixgbe_adapter *adapter = NULL; |
3606 | struct ixgbe_hw *hw; | 3606 | struct ixgbe_hw *hw; |
3607 | const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data]; | 3607 | const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data]; |
3608 | unsigned long mmio_start, mmio_len; | ||
3609 | static int cards_found; | 3608 | static int cards_found; |
3610 | int i, err, pci_using_dac; | 3609 | int i, err, pci_using_dac; |
3611 | u16 link_status, link_speed, link_width; | 3610 | u16 link_status, link_speed, link_width; |
@@ -3657,10 +3656,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3657 | hw->back = adapter; | 3656 | hw->back = adapter; |
3658 | adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1; | 3657 | adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1; |
3659 | 3658 | ||
3660 | mmio_start = pci_resource_start(pdev, 0); | 3659 | hw->hw_addr = ioremap(pci_resource_start(pdev, 0), |
3661 | mmio_len = pci_resource_len(pdev, 0); | 3660 | pci_resource_len(pdev, 0)); |
3662 | |||
3663 | hw->hw_addr = ioremap(mmio_start, mmio_len); | ||
3664 | if (!hw->hw_addr) { | 3661 | if (!hw->hw_addr) { |
3665 | err = -EIO; | 3662 | err = -EIO; |
3666 | goto err_ioremap; | 3663 | goto err_ioremap; |
@@ -3690,9 +3687,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3690 | #endif | 3687 | #endif |
3691 | strcpy(netdev->name, pci_name(pdev)); | 3688 | strcpy(netdev->name, pci_name(pdev)); |
3692 | 3689 | ||
3693 | netdev->mem_start = mmio_start; | ||
3694 | netdev->mem_end = mmio_start + mmio_len; | ||
3695 | |||
3696 | adapter->bd_number = cards_found; | 3690 | adapter->bd_number = cards_found; |
3697 | 3691 | ||
3698 | /* PCI config space info */ | 3692 | /* PCI config space info */ |