From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 12 Dec 2008 19:18:04 +0000 (+0000)
Subject: [etherfabric] Make use of pci_bar_start() 64-bit clean
X-Git-Tag: v0.9.7~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57bbf0ec98205b5c8c7b01c0d6f41bcfc62c499d;p=thirdparty%2Fipxe.git

[etherfabric] Make use of pci_bar_start() 64-bit clean

Driver was storing the result of pci_bar_start() and pci_bar_size() in
an int, rather than an unsigned long.

(Bug was introduced in the vendor's tree in commit eac85cd "Port
etherfabric driver to net_device api".)
---

diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index 365a1602b..704ce98ba 100644
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -4151,7 +4151,8 @@ efab_probe ( struct pci_device *pci,
 {
 	struct net_device *netdev;
 	struct efab_nic *efab;
-	int rc, mmio_start, mmio_len;
+	unsigned long mmio_start, mmio_len;
+	int rc;
 
 	/* Create the network adapter */
 	netdev = alloc_etherdev ( sizeof ( struct efab_nic ) );
@@ -4173,7 +4174,7 @@ efab_probe ( struct pci_device *pci,
 	mmio_start = pci_bar_start ( pci, PCI_BASE_ADDRESS_2 );
 	mmio_len = pci_bar_size ( pci, PCI_BASE_ADDRESS_2 );
 	efab->membase = ioremap ( mmio_start, mmio_len );
-	EFAB_TRACE ( "BAR of %x bytes at phys %x mapped at %p\n",
+	EFAB_TRACE ( "BAR of %lx bytes at phys %lx mapped at %p\n",
 		     mmio_len, mmio_start, efab->membase );
 
 	/* Enable the PCI device */