[PATCH] 64bit resource: fix up printks for resources in networks drivers

This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 5f743b972949..fc2468ecce0b 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -2007,8 +2007,8 @@ static int __init de_init_one (struct pci_dev *pdev,
         }
         if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pci_name(pdev));
+                printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",
+                       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));
                 goto err_out_res;
         }
 
@@ -2016,8 +2016,9 @@ static int __init de_init_one (struct pci_dev *pdev,
         regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
         if (!regs) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));
+                printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
+                        (unsigned long long)pci_resource_len(pdev, 1),
+                        pciaddr, pci_name(pdev));
                 goto err_out_res;
         }
         dev->base_addr = (unsigned long) regs;
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index e0de66739a42..53fd9b56d0bd 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1350,10 +1350,10 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
         if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
-                printk (KERN_ERR PFX "%s: I/O region (0x%lx@0x%lx) too small, "
+                printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, "
                         "aborting\n", pci_name(pdev),
-                        pci_resource_len (pdev, 0),
-                        pci_resource_start (pdev, 0));
+                        (unsigned long long)pci_resource_len (pdev, 0),
+                        (unsigned long long)pci_resource_start (pdev, 0));
                 goto err_out_free_netdev;
         }