Commit e539e466 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik

ixgb: repeat 32 bit ioremap cleanup

this patch has been made to many other drivers in kernel to fix
the storage of 64 bit resources in 32 bit variables.
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 0f8ecbad
...@@ -363,8 +363,6 @@ ixgb_probe(struct pci_dev *pdev, ...@@ -363,8 +363,6 @@ ixgb_probe(struct pci_dev *pdev,
struct net_device *netdev = NULL; struct net_device *netdev = NULL;
struct ixgb_adapter *adapter; struct ixgb_adapter *adapter;
static int cards_found = 0; static int cards_found = 0;
unsigned long mmio_start;
int mmio_len;
int pci_using_dac; int pci_using_dac;
int i; int i;
int err; int err;
...@@ -405,11 +403,9 @@ ixgb_probe(struct pci_dev *pdev, ...@@ -405,11 +403,9 @@ ixgb_probe(struct pci_dev *pdev,
adapter->hw.back = adapter; adapter->hw.back = adapter;
adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT); adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
mmio_start = pci_resource_start(pdev, BAR_0); adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
mmio_len = pci_resource_len(pdev, BAR_0); pci_resource_len(pdev, BAR_0));
if (!adapter->hw.hw_addr) {
adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
if(!adapter->hw.hw_addr) {
err = -EIO; err = -EIO;
goto err_ioremap; goto err_ioremap;
} }
...@@ -444,9 +440,6 @@ ixgb_probe(struct pci_dev *pdev, ...@@ -444,9 +440,6 @@ ixgb_probe(struct pci_dev *pdev,
#endif #endif
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
netdev->mem_start = mmio_start;
netdev->mem_end = mmio_start + mmio_len;
netdev->base_addr = adapter->hw.io_base;
adapter->bd_number = cards_found; adapter->bd_number = cards_found;
adapter->link_speed = 0; adapter->link_speed = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment