[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long

This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.

16 files changed, 88 insertions, 88 deletions

diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c
index 02f03dc78..dcfe66ba8 100644
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -640,7 +640,7 @@ static int t515_probe ( struct nic *nic, struct isapnp_device *isapnp ) {
 		}
 
 	}
-	DBG ( "3c515 Resource configuration register 0x%lX, DCR 0x%hX.\n",
+	DBG ( "3c515 Resource configuration register 0x%X, DCR 0x%hX.\n",
 	      inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) );
 	corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID,
 			       options, nic);
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 079e647e1..bb6d7e96b 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -630,7 +630,7 @@ static void davicom_disable ( struct nic *nic ) {
   outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
 
   /* Clear the missed-packet counter. */
-  (volatile unsigned long)inl(ioaddr + CSR8);
+  inl(ioaddr + CSR8);
 }
 
 
@@ -676,7 +676,7 @@ static int davicom_probe ( struct nic *nic, struct pci_device *pci ) {
   outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
 
   /* Clear the missed-packet counter. */
-  (volatile unsigned long)inl(ioaddr + CSR8);
+  inl(ioaddr + CSR8);
 
   /* Get MAC Address */
   /* read EEPROM data */
diff --git a/src/drivers/net/e1000/e1000.c b/src/drivers/net/e1000/e1000.c
index a9aa508ac..c4f35c1a8 100644
--- a/src/drivers/net/e1000/e1000.c
+++ b/src/drivers/net/e1000/e1000.c
@@ -258,8 +258,8 @@ e1000_configure_tx ( struct e1000_adapter *adapter )
 	E1000_WRITE_REG ( hw, TDBAL, virt_to_bus ( adapter->tx_base ) );
 	E1000_WRITE_REG ( hw, TDLEN, adapter->tx_ring_size );
 			  
-        DBG ( "TDBAL: %#08lx\n",  E1000_READ_REG ( hw, TDBAL ) );
-        DBG ( "TDLEN: %ld\n",     E1000_READ_REG ( hw, TDLEN ) );
+        DBG ( "TDBAL: %#08x\n",  E1000_READ_REG ( hw, TDBAL ) );
+        DBG ( "TDLEN: %d\n",     E1000_READ_REG ( hw, TDLEN ) );
 
 	/* Setup the HW Tx Head and Tail descriptor pointers */
 	E1000_WRITE_REG ( hw, TDH, 0 );
@@ -385,9 +385,9 @@ e1000_configure_rx ( struct e1000_adapter *adapter )
 	E1000_WRITE_REG ( hw, RCTL, rctl );
 	E1000_WRITE_FLUSH ( hw );
 
-        DBG ( "RDBAL: %#08lx\n",  E1000_READ_REG ( hw, RDBAL ) );
-        DBG ( "RDLEN: %ld\n",     E1000_READ_REG ( hw, RDLEN ) );
-        DBG ( "RCTL:  %#08lx\n",  E1000_READ_REG ( hw, RCTL ) );
+        DBG ( "RDBAL: %#08x\n",  E1000_READ_REG ( hw, RDBAL ) );
+        DBG ( "RDLEN: %d\n",     E1000_READ_REG ( hw, RDLEN ) );
+        DBG ( "RCTL:  %#08x\n",  E1000_READ_REG ( hw, RCTL ) );
 }
 
 /**
@@ -577,7 +577,7 @@ e1000_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
 		E1000_TXD_CMD_IFCS | iob_len ( iobuf );
 	tx_curr_desc->upper.data = 0;
 	
-	DBG ( "TX fill: %ld tx_curr: %ld addr: %#08lx len: %zd\n", adapter->tx_fill_ctr, 
+	DBG ( "TX fill: %d tx_curr: %d addr: %#08lx len: %zd\n", adapter->tx_fill_ctr, 
 	      tx_curr, virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
 	      
 	/* Point to next free descriptor */
@@ -620,7 +620,7 @@ e1000_poll ( struct net_device *netdev )
 	if ( ! icr )
 		return;
 		
-        DBG ( "e1000_poll: intr_status = %#08lx\n", icr );
+        DBG ( "e1000_poll: intr_status = %#08x\n", icr );
 
 	/* Check status of transmitted packets
 	 */
@@ -635,17 +635,17 @@ e1000_poll ( struct net_device *netdev )
 		if ( ! ( tx_status & E1000_TXD_STAT_DD ) )
 			break;
 		
-		DBG ( "Sent packet. tx_head: %ld tx_tail: %ld tx_status: %#08lx\n",
+		DBG ( "Sent packet. tx_head: %d tx_tail: %d tx_status: %#08x\n",
 	    	      adapter->tx_head, adapter->tx_tail, tx_status );
 
 		if ( tx_status & ( E1000_TXD_STAT_EC | E1000_TXD_STAT_LC | 
 				   E1000_TXD_STAT_TU ) ) {
 			netdev_tx_complete_err ( netdev, adapter->tx_iobuf[i], -EINVAL );
-			DBG ( "Error transmitting packet, tx_status: %#08lx\n",
+			DBG ( "Error transmitting packet, tx_status: %#08x\n",
 			      tx_status );
 		} else {
 			netdev_tx_complete ( netdev, adapter->tx_iobuf[i] );
-			DBG ( "Success transmitting packet, tx_status: %#08lx\n",
+			DBG ( "Success transmitting packet, tx_status: %#08x\n",
 			      tx_status );
 		}
 
@@ -667,16 +667,16 @@ e1000_poll ( struct net_device *netdev )
 			          ( i * sizeof ( *adapter->rx_base ) ); 
 		rx_status = rx_curr_desc->status;
 		
-		DBG2 ( "Before DD Check RX_status: %#08lx\n", rx_status );
+		DBG2 ( "Before DD Check RX_status: %#08x\n", rx_status );
 	
 		if ( ! ( rx_status & E1000_RXD_STAT_DD ) )
 			break;
 
-		DBG ( "RCTL = %#08lx\n", E1000_READ_REG ( &adapter->hw, RCTL ) );
+		DBG ( "RCTL = %#08x\n", E1000_READ_REG ( &adapter->hw, RCTL ) );
 	
 		rx_len = rx_curr_desc->length;
 
-                DBG ( "Received packet, rx_curr: %ld  rx_status: %#08lx  rx_len: %ld\n",
+                DBG ( "Received packet, rx_curr: %d  rx_status: %#08x  rx_len: %d\n",
                       i, rx_status, rx_len );
                 
                 rx_err = rx_curr_desc->errors;
@@ -685,7 +685,7 @@ e1000_poll ( struct net_device *netdev )
 		
 			netdev_rx_err ( netdev, NULL, -EINVAL );
 			DBG ( "e1000_poll: Corrupted packet received!"
-			      " rx_err: %#08lx\n", rx_err );
+			      " rx_err: %#08x\n", rx_err );
 		} else 	{
 		
 			/* If unable allocate space for this packet,
@@ -962,7 +962,7 @@ e1000_open ( struct net_device *netdev )
 
 	e1000_configure_rx ( adapter );
 	
-        DBG ( "RXDCTL: %#08lx\n",  E1000_READ_REG ( &adapter->hw, RXDCTL ) );
+        DBG ( "RXDCTL: %#08x\n",  E1000_READ_REG ( &adapter->hw, RXDCTL ) );
 
 	return 0;
 
diff --git a/src/drivers/net/e1000/e1000_hw.c b/src/drivers/net/e1000/e1000_hw.c
index 0667ad61d..1054b90a0 100644
--- a/src/drivers/net/e1000/e1000_hw.c
+++ b/src/drivers/net/e1000/e1000_hw.c
@@ -1429,7 +1429,7 @@ e1000_copper_link_preconfig(struct e1000_hw *hw)
         DEBUGOUT("Error, did not detect valid phy.\n");
         return ret_val;
     }
-    DEBUGOUT1("Phy ID = %#08lx \n", hw->phy_id);
+    DEBUGOUT1("Phy ID = %#08x \n", hw->phy_id);
 
     /* Set PHY to class A mode (if necessary) */
     ret_val = e1000_set_phy_mode(hw);
@@ -3551,7 +3551,7 @@ e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
     DEBUGFUNC("e1000_read_phy_reg_ex");
 
     if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %ld is out of range\n", reg_addr);
+        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
         return -E1000_ERR_PARAM;
     }
 
@@ -3689,7 +3689,7 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
     DEBUGFUNC("e1000_write_phy_reg_ex");
 
     if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %ld is out of range\n", reg_addr);
+        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
         return -E1000_ERR_PARAM;
     }
 
@@ -4141,10 +4141,10 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
     phy_init_status = e1000_set_phy_type(hw);
 
     if ((match) && (phy_init_status == E1000_SUCCESS)) {
-        DEBUGOUT1("PHY ID %#08lx detected\n", hw->phy_id);
+        DEBUGOUT1("PHY ID %#08x detected\n", hw->phy_id);
         return E1000_SUCCESS;
     }
-    DEBUGOUT1("Invalid PHY ID %#08lx\n", hw->phy_id);
+    DEBUGOUT1("Invalid PHY ID %#08x\n", hw->phy_id);
     return -E1000_ERR_PHY;
 }
 
@@ -8795,13 +8795,13 @@ e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte)
     int32_t error = E1000_SUCCESS;
     int32_t program_retries = 0;
 
-    DEBUGOUT2("Byte := %2.2X Offset := %ld\n", byte, index);
+    DEBUGOUT2("Byte := %2.2X Offset := %d\n", byte, index);
 
     error = e1000_write_ich8_byte(hw, index, byte);
 
     if (error != E1000_SUCCESS) {
         for (program_retries = 0; program_retries < 100; program_retries++) {
-            DEBUGOUT2("Retrying \t Byte := %2.2X Offset := %ld\n", byte, index);
+            DEBUGOUT2("Retrying \t Byte := %2.2X Offset := %d\n", byte, index);
             error = e1000_write_ich8_byte(hw, index, byte);
             udelay(100);
             if (error == E1000_SUCCESS)
diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index f0d52044b..3a78dcef4 100644
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -219,7 +219,7 @@ ipoib_cache_peer ( const struct ib_gid *gid, unsigned long qpn ) {
 	peer->key = key;
 	peer->mac.qpn = htonl ( qpn );
 	memcpy ( &peer->mac.gid, gid, sizeof ( peer->mac.gid ) );
-	DBG ( "IPoIB peer %x has GID %08lx:%08lx:%08lx:%08lx and QPN %lx\n",
+	DBG ( "IPoIB peer %x has GID %08x:%08x:%08x:%08x and QPN %lx\n",
 	      peer->key, htonl ( gid->u.dwords[0] ),
 	      htonl ( gid->u.dwords[1] ), htonl ( gid->u.dwords[2] ),
 	      htonl ( gid->u.dwords[3] ), qpn );
@@ -313,7 +313,7 @@ const char * ipoib_ntoa ( const void *ll_addr ) {
 	static char buf[45];
 	const struct ipoib_mac *mac = ll_addr;
 
-	snprintf ( buf, sizeof ( buf ), "%08lx:%08lx:%08lx:%08lx:%08lx",
+	snprintf ( buf, sizeof ( buf ), "%08x:%08x:%08x:%08x:%08x",
 		   htonl ( mac->qpn ), htonl ( mac->gid.u.dwords[0] ),
 		   htonl ( mac->gid.u.dwords[1] ),
 		   htonl ( mac->gid.u.dwords[2] ),
diff --git a/src/drivers/net/mtnic.c b/src/drivers/net/mtnic.c
index dd577f4a8..240caf601 100755
--- a/src/drivers/net/mtnic.c
+++ b/src/drivers/net/mtnic.c
@@ -87,7 +87,7 @@
 * and it's physical aligned address in 'pa'
 */
 static int
-mtnic_alloc_aligned(unsigned int size, void **va, u32 *pa, unsigned int alignment)
+mtnic_alloc_aligned(unsigned int size, void **va, unsigned long *pa, unsigned int alignment)
 {
 	*va = alloc_memblock(size, alignment);
 	if (!*va) {
@@ -157,7 +157,7 @@ mtnic_alloc_iobuf(struct mtnic_priv *priv, struct mtnic_ring *ring,
 		if (!&ring->iobuf[index]) {
 			if (ring->prod <= (ring->cons + 1)) {
 				DBG("Error allocating Rx io "
-				    "buffer number %lx", index);
+				    "buffer number %x", index);
 				/* In case of error freeing io buffer */
 				mtnic_free_io_buffers(ring);
 				return MTNIC_ERROR;
@@ -211,14 +211,14 @@ mtnic_alloc_ring(struct mtnic_priv *priv, struct mtnic_ring *ring,
 	err = mtnic_alloc_aligned(ring->buf_size, (void *)&ring->buf,
 			    &ring->dma, PAGE_SIZE);
         if (err) {
-		DBG("Failed allocating descriptor ring sizeof %lx\n",
+		DBG("Failed allocating descriptor ring sizeof %x\n",
 		    ring->buf_size);
 		return MTNIC_ERROR;
 	}
         memset(ring->buf, 0, ring->buf_size);
 
-	DBG("Allocated %s ring (addr:%p) - buf:%p size:%lx"
-	    "buf_size:%lx dma:%lx\n",
+	DBG("Allocated %s ring (addr:%p) - buf:%p size:%x"
+	    "buf_size:%x dma:%lx\n",
 	    is_rx ? "Rx" : "Tx", ring, ring->buf, ring->size,
 	    ring->buf_size, ring->dma);
 
@@ -262,7 +262,7 @@ mtnic_alloc_ring(struct mtnic_priv *priv, struct mtnic_ring *ring,
 			((u32) priv->fw.tx_offset[priv->port]) << 8);
 
 		/* Map Tx+CQ doorbells */
-		DBG("Mapping TxCQ doorbell at offset:0x%lx\n",
+		DBG("Mapping TxCQ doorbell at offset:0x%x\n",
 		    priv->fw.txcq_db_offset);
 		ring->txcq_db = ioremap(mtnic_pci_dev.dev.bar[2] +
 				priv->fw.txcq_db_offset, PAGE_SIZE);
@@ -317,9 +317,9 @@ mtnic_alloc_cq(struct net_device *dev, int num, struct mtnic_cq *cq,
 		return MTNIC_ERROR;
 	}
         memset(cq->buf, 0, cq->buf_size);
-        DBG("Allocated CQ (addr:%p) - size:%lx buf:%p buf_size:%lx "
+        DBG("Allocated CQ (addr:%p) - size:%x buf:%p buf_size:%x "
 	    "dma:%lx db:%p db_dma:%lx\n"
-	    "cqn offset:%lx \n", cq, cq->size, cq->buf,
+	    "cqn offset:%x \n", cq, cq->size, cq->buf,
 	    cq->buf_size, cq->dma, cq->db,
 	    cq->db_dma, offset_ind);
 
@@ -570,7 +570,7 @@ mtnic_map_cmd(struct mtnic_priv *priv, u16 op, struct mtnic_pages pages)
 	len = PAGE_SIZE * pages.num;
 	pages.buf = (u32 *)umalloc(PAGE_SIZE * (pages.num + 1));
 	addr = PAGE_SIZE + ((virt_to_bus(pages.buf) & 0xfffff000) + PAGE_SIZE);
-	DBG("Mapping pages: size: %lx address: %p\n", pages.num, pages.buf);
+	DBG("Mapping pages: size: %x address: %p\n", pages.num, pages.buf);
 
 	if (addr & (PAGE_MASK)) {
 		DBG("Got FW area not aligned to %d (%llx/%x)\n",
@@ -657,7 +657,7 @@ mtnic_OPEN_NIC(struct mtnic_priv *priv)
 
 	err = mtnic_cmd(priv, NULL, extra_pages, 0, MTNIC_IF_CMD_OPEN_NIC);
 	priv->fw.extra_pages.num = be32_to_cpu(*(extra_pages+1));
-	DBG("Extra pages num is %lx\n", priv->fw.extra_pages.num);
+	DBG("Extra pages num is %x\n", priv->fw.extra_pages.num);
 	return err;
 }
 
@@ -748,7 +748,7 @@ mtnic_CONFIG_CQ(struct mtnic_priv *priv, int port,
 	config_cq->offset = ((cq->dma) & (PAGE_MASK)) >> 6;
 	config_cq->db_record_addr_l = cpu_to_be32(cq->db_dma);
         config_cq->page_address[1] = cpu_to_be32(cq->dma);
-	DBG("config cq address: %lx dma_address: %lx"
+	DBG("config cq address: %x dma_address: %lx"
 	    "offset: %d size %d index: %d "
 	    , config_cq->page_address[1],cq->dma,
 	    config_cq->offset, config_cq->size, config_cq->cq );
@@ -1115,7 +1115,7 @@ int mtnic_init_card(struct net_device *dev)
 	/* Allocate and map pages worksace */
 	err = mtnic_map_cmd(priv, MTNIC_IF_CMD_MAP_PAGES, priv->fw.extra_pages);
 	if (err) {
-		DBG("Couldn't allocate %lx FW extra pages, aborting.\n",
+		DBG("Couldn't allocate %x FW extra pages, aborting.\n",
 		    priv->fw.extra_pages.num);
 		if (priv->fw.extra_pages.buf)
 			free(priv->fw.extra_pages.buf);
@@ -1503,7 +1503,7 @@ mtnic_transmit( struct net_device *dev, struct io_buffer *iobuf )
 
         index = ring->prod & ring->size_mask;
 	if ((ring->prod - ring->cons) >= ring->size) {
-		DBG("No space left for descriptors!!! cons: %lx prod: %lx\n",
+		DBG("No space left for descriptors!!! cons: %x prod: %x\n",
 		    ring->cons, ring->prod);
 		mdelay(5);
 		return MTNIC_ERROR;/* no space left */
@@ -1690,7 +1690,7 @@ mtnic_probe(struct pci_device *pci,
 	result = ntohl(readl(dev_id));
 	iounmap(dev_id);
         if (result != MTNIC_DEVICE_ID) {
-		DBG("Wrong Devie ID (0x%lx) !!!", result);
+		DBG("Wrong Devie ID (0x%x) !!!", result);
 		return MTNIC_ERROR;
 	}
 
diff --git a/src/drivers/net/mtnic.h b/src/drivers/net/mtnic.h
index 70a238e5b..0987be7a7 100755
--- a/src/drivers/net/mtnic.h
+++ b/src/drivers/net/mtnic.h
@@ -376,7 +376,7 @@ struct mtnic_err_buf {
 
 struct mtnic_cmd {
 	void                     *buf;
-	u32	                mapping;
+	unsigned long             mapping;
 	u32	 	      	  tbit;
 };
 
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 84bfd7ab3..3a7762347 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -358,7 +358,7 @@ static int natsemi_open (struct net_device *netdev)
 	}
 	outl (virt_to_bus (&np->tx[0]),np->ioaddr + TxRingPtr);
 
-	DBG ("Natsemi Tx descriptor loaded with: %#08lx\n",
+	DBG ("Natsemi Tx descriptor loaded with: %#08x\n",
 	     inl (np->ioaddr + TxRingPtr));
 
 	/* Setup RX ring
@@ -377,7 +377,7 @@ static int natsemi_open (struct net_device *netdev)
 	}
 	outl (virt_to_bus (&np->rx[0]), np->ioaddr + RxRingPtr);
 
-	DBG ("Natsemi Rx descriptor loaded with: %#08lx\n",
+	DBG ("Natsemi Rx descriptor loaded with: %#08x\n",
 	      inl (np->ioaddr + RxRingPtr));		
 
 	/* Setup RX Filter 
@@ -401,7 +401,7 @@ static int natsemi_open (struct net_device *netdev)
 	outl (tx_config, np->ioaddr + TxConfig);
 	outl (rx_config, np->ioaddr + RxConfig);
 
-	DBG ("Tx config register = %#08lx Rx config register = %#08lx\n", 
+	DBG ("Tx config register = %#08x Rx config register = %#08x\n", 
                inl (np->ioaddr + TxConfig),
 	       inl (np->ioaddr + RxConfig));
 
@@ -552,7 +552,7 @@ static void natsemi_poll (struct net_device *netdev)
 			netdev_rx_err (netdev, NULL, -EINVAL);
 
 			DBG ("natsemi_poll: Corrupted packet received!"
-			     " Status = %#08lx\n",
+			     " Status = %#08x\n",
 			      np->rx[np->rx_cur].cmdsts);
 
 		} else 	{
diff --git a/src/drivers/net/phantom/phantom.c b/src/drivers/net/phantom/phantom.c
index 33c76f629..1d1637d8d 100644
--- a/src/drivers/net/phantom/phantom.c
+++ b/src/drivers/net/phantom/phantom.c
@@ -460,11 +460,11 @@ static int phantom_dmesg ( struct phantom_nic *phantom, unsigned int log,
 	len = phantom_readl ( phantom, UNM_CAM_RAM_DMESG_LEN ( log ) );
 	tail = phantom_readl ( phantom, UNM_CAM_RAM_DMESG_TAIL ( log ) );
 	sig = phantom_readl ( phantom, UNM_CAM_RAM_DMESG_SIG ( log ) );
-	DBGC ( phantom, "Phantom %p firmware dmesg buffer %d (%08lx-%08lx)\n",
+	DBGC ( phantom, "Phantom %p firmware dmesg buffer %d (%08x-%08x)\n",
 	       phantom, log, head, tail );
 	assert ( ( head & 0x07 ) == 0 );
 	if ( sig != UNM_CAM_RAM_DMESG_SIG_MAGIC ) {
-		DBGC ( phantom, "Warning: bad signature %08lx (want %08lx)\n",
+		DBGC ( phantom, "Warning: bad signature %08x (want %08lx)\n",
 		       sig, UNM_CAM_RAM_DMESG_SIG_MAGIC );
 	}
 
@@ -558,8 +558,8 @@ static int phantom_issue_cmd ( struct phantom_nic *phantom,
 	/* Issue command */
 	signature = NX_CDRP_SIGNATURE_MAKE ( phantom->port,
 					     NXHAL_VERSION );
-	DBGC2 ( phantom, "Phantom %p issuing command %08lx (%08lx, %08lx, "
-		"%08lx)\n", phantom, command, arg1, arg2, arg3 );
+	DBGC2 ( phantom, "Phantom %p issuing command %08x (%08x, %08x, "
+		"%08x)\n", phantom, command, arg1, arg2, arg3 );
 	phantom_writel ( phantom, signature, UNM_NIC_REG_NX_SIGN );
 	phantom_writel ( phantom, arg1, UNM_NIC_REG_NX_ARG1 );
 	phantom_writel ( phantom, arg2, UNM_NIC_REG_NX_ARG2 );
@@ -1036,7 +1036,7 @@ static void phantom_poll_link_state ( struct net_device *netdev ) {
 		return;
 
 	/* Record new link state */
-	DBGC ( phantom, "Phantom %p new link state %08lx (was %08lx)\n",
+	DBGC ( phantom, "Phantom %p new link state %08x (was %08x)\n",
 	       phantom, xg_state_p3, phantom->link_state );
 	phantom->link_state = xg_state_p3;
 
@@ -1840,13 +1840,13 @@ static int phantom_init_cmdpeg ( struct phantom_nic *phantom ) {
 		       phantom );
 		sw_reset = phantom_readl ( phantom, UNM_ROMUSB_GLB_SW_RESET );
 		if ( sw_reset != UNM_ROMUSB_GLB_SW_RESET_MAGIC ) {
-			DBGC ( phantom, "Phantom %p reset failed: %08lx\n",
+			DBGC ( phantom, "Phantom %p reset failed: %08x\n",
 			       phantom, sw_reset );
 			return -EIO;
 		}
 	} else {
 		DBGC ( phantom, "Phantom %p coming up from warm boot "
-		       "(%08lx)\n", phantom, cold_boot );
+		       "(%08x)\n", phantom, cold_boot );
 	}
 	/* Clear cold-boot flag */
 	phantom_writel ( phantom, 0, UNM_CAM_RAM_COLD_BOOT );
@@ -1874,7 +1874,7 @@ static int phantom_init_cmdpeg ( struct phantom_nic *phantom ) {
 					       UNM_NIC_REG_CMDPEG_STATE );
 		if ( cmdpeg_state != last_cmdpeg_state ) {
 			DBGC ( phantom, "Phantom %p command PEG state is "
-			       "%08lx after %d seconds...\n",
+			       "%08x after %d seconds...\n",
 			       phantom, cmdpeg_state, retries );
 			last_cmdpeg_state = cmdpeg_state;
 		}
@@ -1889,7 +1889,7 @@ static int phantom_init_cmdpeg ( struct phantom_nic *phantom ) {
 	}
 
 	DBGC ( phantom, "Phantom %p timed out waiting for command PEG to "
-	       "initialise (status %08lx)\n", phantom, cmdpeg_state );
+	       "initialise (status %08x)\n", phantom, cmdpeg_state );
 	return -ETIMEDOUT;
 }
 
@@ -1968,7 +1968,7 @@ static int phantom_init_rcvpeg ( struct phantom_nic *phantom ) {
 					       UNM_NIC_REG_RCVPEG_STATE );
 		if ( rcvpeg_state != last_rcvpeg_state ) {
 			DBGC ( phantom, "Phantom %p receive PEG state is "
-			       "%08lx after %d seconds...\n",
+			       "%08x after %d seconds...\n",
 			       phantom, rcvpeg_state, retries );
 			last_rcvpeg_state = rcvpeg_state;
 		}
@@ -1978,7 +1978,7 @@ static int phantom_init_rcvpeg ( struct phantom_nic *phantom ) {
 	}
 
 	DBGC ( phantom, "Phantom %p timed out waiting for receive PEG to "
-	       "initialise (status %08lx)\n", phantom, rcvpeg_state );
+	       "initialise (status %08x)\n", phantom, rcvpeg_state );
 	return -ETIMEDOUT;
 }
 
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 150bbe69c..b5e3755f4 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -50,8 +50,8 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
   /* Fill out hw structure */
   hw->membase = attr_mem;
   hw->iobase = iobase;
-  printf ( "PLX9052 has local config registers at %#lx\n", plx_lcr );
-  printf ( "Prism2 has attribute memory at %#lx and I/O base at %#lx\n", attr_mem, iobase );
+  printf ( "PLX9052 has local config registers at %#x\n", plx_lcr );
+  printf ( "Prism2 has attribute memory at %#x and I/O base at %#x\n", attr_mem, iobase );
 
   /* Search for CIS strings */
   printf ( "Searching for PCMCIA card...\n" );
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 0554058e6..4315f47a7 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -425,7 +425,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
 	DBG ( "tp->mac_version = %d\n", tp->mac_version );
 
 	if (p->mask == 0x00000000) {
-		DBG ( "unknown MAC (%08lx)\n", reg );
+		DBG ( "unknown MAC (%08x)\n", reg );
 	}
 }
 
@@ -1621,17 +1621,17 @@ rtl8169_process_tx_packets ( struct net_device *netdev )
 
 		tx_status = tx_curr_desc->opts1;
 
-		DBG2 ( "Before DescOwn check tx_status: %#08lx\n", tx_status );
+		DBG2 ( "Before DescOwn check tx_status: %#08x\n", tx_status );
 
 		/* if the packet at tx_tail is not owned by hardware it is for us */
 		if ( tx_status & DescOwn )
 			break;
 
 		DBG ( "Transmitted packet.\n" );
-		DBG ( "tp->tx_fill_ctr     = %ld\n", tp->tx_fill_ctr );
-		DBG ( "tp->tx_tail         = %ld\n", tp->tx_tail );
-		DBG ( "tp->tx_curr         = %ld\n", tp->tx_curr );
-		DBG ( "tx_status           = %ld\n", tx_status );
+		DBG ( "tp->tx_fill_ctr     = %d\n", tp->tx_fill_ctr );
+		DBG ( "tp->tx_tail         = %d\n", tp->tx_tail );
+		DBG ( "tp->tx_curr         = %d\n", tp->tx_curr );
+		DBG ( "tx_status           = %d\n", tx_status );
 		DBG ( "tx_curr_desc        = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
 
 		/* Pass packet to core for processing */
@@ -1660,7 +1660,7 @@ rtl8169_populate_rx_descriptor ( struct rtl8169_private *tp, struct RxDesc *rx_d
 {
 	DBGP ( "rtl8169_populate_rx_descriptor\n" );
 
-	DBG ( "Populating rx descriptor %ld\n", index );
+	DBG ( "Populating rx descriptor %d\n", index );
 
 	memset ( rx_desc, 0, sizeof ( *rx_desc ) );
 
@@ -1755,7 +1755,7 @@ rtl8169_process_rx_packets ( struct net_device *netdev )
 
 		rx_status = rx_curr_desc->opts1;
 
-		DBG2 ( "Before DescOwn check rx_status: %#08lx\n", rx_status );
+		DBG2 ( "Before DescOwn check rx_status: %#08x\n", rx_status );
 
 		/* Hardware still owns the descriptor */
 		if ( rx_status & DescOwn )
@@ -1768,9 +1768,9 @@ rtl8169_process_rx_packets ( struct net_device *netdev )
 		rx_len = rx_status & 0x3fff;
 
 		DBG ( "Received packet.\n" );
-		DBG ( "tp->rx_curr         = %ld\n", tp->rx_curr );
+		DBG ( "tp->rx_curr         = %d\n", tp->rx_curr );
 		DBG ( "rx_len              = %d\n", rx_len );
-		DBG ( "rx_status           = %#08lx\n", rx_status );
+		DBG ( "rx_status           = %#08x\n", rx_status );
 		DBG ( "rx_curr_desc        = %#08lx\n", virt_to_bus ( rx_curr_desc ) );
 
 		if ( rx_status & RxRES ) {
@@ -1778,7 +1778,7 @@ rtl8169_process_rx_packets ( struct net_device *netdev )
 			netdev_rx_err ( netdev, tp->rx_iobuf[tp->rx_curr], -EINVAL );
 
 			DBG ( "rtl8169_poll: Corrupted packet received!\n"
-			       " rx_status: %#08lx\n", rx_status );
+			       " rx_status: %#08x\n", rx_status );
 
 		} else 	{
 
@@ -1964,11 +1964,11 @@ rtl8169_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
 
 	tx_curr_desc = tp->tx_base + tp->tx_curr;
 
-	DBG ( "tp->tx_fill_ctr = %ld\n", tp->tx_fill_ctr );
-	DBG ( "tp->tx_curr     = %ld\n", tp->tx_curr );
+	DBG ( "tp->tx_fill_ctr = %d\n", tp->tx_fill_ctr );
+	DBG ( "tp->tx_curr     = %d\n", tp->tx_curr );
 	DBG ( "tx_curr_desc    = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
 	DBG ( "iobuf->data     = %#08lx\n", virt_to_bus ( iobuf->data ) );
-	DBG ( "tx_len          = %ld\n", tx_len );
+	DBG ( "tx_len          = %d\n", tx_len );
 
 	/* Configure current descriptor to transmit supplied packet */
 	tx_curr_desc->addr_hi = 0;
@@ -1981,10 +1981,10 @@ rtl8169_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
 	/* Mark descriptor as owned by NIC */
 	tx_curr_desc->opts1 |= DescOwn;
 
-	DBG ( "tx_curr_desc->opts1   = %#08lx\n", tx_curr_desc->opts1 );
-	DBG ( "tx_curr_desc->opts2   = %#08lx\n", tx_curr_desc->opts2 );
-	DBG ( "tx_curr_desc->addr_hi = %#08lx\n", tx_curr_desc->addr_hi );
-	DBG ( "tx_curr_desc->addr_lo = %#08lx\n", tx_curr_desc->addr_lo );
+	DBG ( "tx_curr_desc->opts1   = %#08x\n", tx_curr_desc->opts1 );
+	DBG ( "tx_curr_desc->opts2   = %#08x\n", tx_curr_desc->opts2 );
+	DBG ( "tx_curr_desc->addr_hi = %#08x\n", tx_curr_desc->addr_hi );
+	DBG ( "tx_curr_desc->addr_lo = %#08x\n", tx_curr_desc->addr_lo );
 
 	RTL_W8 ( TxPoll, NPQ );	/* set polling bit */
 
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 585265063..008b9cf72 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -695,7 +695,7 @@ sis900_init_rxfilter(struct nic *nic)
         outl(w, ioaddr + rfdr);
 
         if (sis900_debug > 0)
-            printf("sis900_init_rxfilter: Receive Filter Addrss[%d]=%lX\n",
+            printf("sis900_init_rxfilter: Receive Filter Addrss[%d]=%X\n",
                    i, inl(ioaddr + rfdr));
     }
 
@@ -724,7 +724,7 @@ sis900_init_txd(struct nic *nic __unused)
     /* load Transmit Descriptor Register */
     outl(virt_to_bus(&txd), ioaddr + txdp); 
     if (sis900_debug > 0)
-        printf("sis900_init_txd: TX descriptor register loaded with: %lX\n", 
+        printf("sis900_init_txd: TX descriptor register loaded with: %X\n", 
                inl(ioaddr + txdp));
 }
 
@@ -760,7 +760,7 @@ sis900_init_rxd(struct nic *nic __unused)
     outl(virt_to_bus(&rxd[0]), ioaddr + rxdp);
 
     if (sis900_debug > 0)
-        printf("sis900_init_rxd: RX descriptor register loaded with: %lX\n", 
+        printf("sis900_init_rxd: RX descriptor register loaded with: %X\n", 
                inl(ioaddr + rxdp));
 
 }
@@ -1114,7 +1114,7 @@ sis900_transmit(struct nic  *nic,
     /* load Transmit Descriptor Register */
     outl(virt_to_bus(&txd), ioaddr + txdp); 
     if (sis900_debug > 1)
-        printf("sis900_transmit: TX descriptor register loaded with: %lX\n", 
+        printf("sis900_transmit: TX descriptor register loaded with: %X\n", 
                inl(ioaddr + txdp));
 
     memcpy(txb, d, ETH_ALEN);
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 3b6f5a88b..3156ee9db 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -689,9 +689,9 @@ static int sundance_probe ( struct nic *nic, struct pci_device *pci ) {
 	}
 
 	/* Reset the chip to erase previous misconfiguration */
-	DBG ( "ASIC Control is %#lx\n", inl(BASE + ASICCtrl) );
+	DBG ( "ASIC Control is %#x\n", inl(BASE + ASICCtrl) );
 	outw(0x007f, BASE + ASICCtrl + 2);
-	DBG ( "ASIC Control is now %#lx.\n", inl(BASE + ASICCtrl) );
+	DBG ( "ASIC Control is now %#x.\n", inl(BASE + ASICCtrl) );
 
 	sundance_reset(nic);
 	if (sdc->an_enable) {
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index bcb9dda78..14093bb2a 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -1460,7 +1460,7 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, uint32_t enable_bit
 	}
 
 	if (i == MAX_WAIT_CNT) {
-		printf( "tg3_stop_block timed out, ofs=%#lx enable_bit=%3lx\n",
+		printf( "tg3_stop_block timed out, ofs=%#lx enable_bit=%3x\n",
 		       ofs, enable_bit );
 		return -ENODEV;
 	}
@@ -1665,7 +1665,7 @@ static int tg3_restart_fw(struct tg3 *tp, uint32_t state)
 	if (i >= 100000 &&
 		    !(tp->tg3_flags2 & TG3_FLG2_SUN_5704) &&
 		    !(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)) {
-		printf ( "Firmware will not restart magic=%#lx\n",
+		printf ( "Firmware will not restart magic=%#x\n",
 			val );
 		return -ENODEV;
 	}
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 53cfb85f9..afd7d45b3 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -1201,7 +1201,7 @@ static void tulip_disable ( struct nic *nic ) {
     outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
 
     /* Clear the missed-packet counter. */
-    (volatile unsigned long)inl(ioaddr + CSR8);
+    inl(ioaddr + CSR8);
 }
 
 /*********************************************************************/
@@ -1265,7 +1265,7 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) {
     outl(inl(ioaddr + CSR6) & ~0x00002002, ioaddr + CSR6);
 
     /* Clear the missed-packet counter. */
-    (volatile unsigned long)inl(ioaddr + CSR8);
+    inl(ioaddr + CSR8);
 
     printf("\n");                /* so we start on a fresh line */
 #ifdef TULIP_DEBUG_WHERE
diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c
index 428f609c7..a786735ee 100644
--- a/src/drivers/net/via-velocity.c
+++ b/src/drivers/net/via-velocity.c
@@ -1234,7 +1234,7 @@ static int velocity_open(struct nic *nic, struct pci_device *pci __unused)
 
 	/* Tx Descriptor needs 64 bytes alignment; */
 	TxPhyAddr = virt_to_bus(vptr->TxDescArrays);
-	printf("Unaligned Address : %lX\n", TxPhyAddr);
+	printf("Unaligned Address : %X\n", TxPhyAddr);
 	diff = 64 - (TxPhyAddr - ((TxPhyAddr >> 6) << 6));
 	TxPhyAddr += diff;
 	vptr->td_rings = (struct tx_desc *) (vptr->TxDescArrays + diff);