]> err.no Git - linux-2.6/commitdiff
ixgb: repeat 32 bit ioremap cleanup
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Tue, 8 Jul 2008 22:51:12 +0000 (15:51 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 11 Jul 2008 05:20:26 +0000 (01:20 -0400)
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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/ixgb/ixgb_main.c

index 04cac41f7d5e38f6bcccddc1ca71c832c0f0517f..652c0eab3a4a0eca47ef0f395a0fd8dd17db59c4 100644 (file)
@@ -363,8 +363,6 @@ ixgb_probe(struct pci_dev *pdev,
        struct net_device *netdev = NULL;
        struct ixgb_adapter *adapter;
        static int cards_found = 0;
-       unsigned long mmio_start;
-       int mmio_len;
        int pci_using_dac;
        int i;
        int err;
@@ -405,11 +403,9 @@ ixgb_probe(struct pci_dev *pdev,
        adapter->hw.back = adapter;
        adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
 
-       mmio_start = pci_resource_start(pdev, BAR_0);
-       mmio_len = pci_resource_len(pdev, BAR_0);
-
-       adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
-       if(!adapter->hw.hw_addr) {
+       adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
+                                     pci_resource_len(pdev, BAR_0));
+       if (!adapter->hw.hw_addr) {
                err = -EIO;
                goto err_ioremap;
        }
@@ -444,9 +440,6 @@ ixgb_probe(struct pci_dev *pdev,
 #endif
 
        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->link_speed = 0;