[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.

6 files changed, 13 insertions, 13 deletions

diff --git a/src/drivers/infiniband/arbel.c b/src/drivers/infiniband/arbel.c
index e516031ba..7d5099547 100644
--- a/src/drivers/infiniband/arbel.c
+++ b/src/drivers/infiniband/arbel.c
@@ -992,7 +992,7 @@ static void arbel_ring_doorbell ( struct arbel *arbel,
 				  union arbelprm_doorbell_register *db_reg,
 				  unsigned int offset ) {
 
-	DBGC2 ( arbel, "Arbel %p ringing doorbell %08lx:%08lx at %lx\n",
+	DBGC2 ( arbel, "Arbel %p ringing doorbell %08x:%08x at %lx\n",
 		arbel, db_reg->dword[0], db_reg->dword[1],
 		virt_to_phys ( arbel->uar + offset ) );
 
@@ -1182,7 +1182,7 @@ static int arbel_complete ( struct ib_device *ibdev,
 	if ( opcode >= ARBEL_OPCODE_RECV_ERROR ) {
 		/* "s" field is not valid for error opcodes */
 		is_send = ( opcode == ARBEL_OPCODE_SEND_ERROR );
-		DBGC ( arbel, "Arbel %p CPN %lx syndrome %lx vendor %lx\n",
+		DBGC ( arbel, "Arbel %p CPN %lx syndrome %x vendor %x\n",
 		       arbel, cq->cqn, MLX_GET ( &cqe->error, syndrome ),
 		       MLX_GET ( &cqe->error, vendor_code ) );
 		rc = -EIO;
@@ -1492,7 +1492,7 @@ static void arbel_poll_eq ( struct ib_device *ibdev ) {
 
 		/* Ring doorbell */
 		MLX_FILL_1 ( &db_reg.ci, 0, ci, arbel_eq->next_idx );
-		DBGCP ( arbel, "Ringing doorbell %08lx with %08lx\n",
+		DBGCP ( arbel, "Ringing doorbell %08lx with %08x\n",
 			virt_to_phys ( arbel_eq->doorbell ),
 			db_reg.dword[0] );
 		writel ( db_reg.dword[0], arbel_eq->doorbell );
@@ -1696,7 +1696,7 @@ static int arbel_start_firmware ( struct arbel *arbel ) {
 		       arbel, strerror ( rc ) );
 		goto err_query_fw;
 	}
-	DBGC ( arbel, "Arbel %p firmware version %ld.%ld.%ld\n", arbel,
+	DBGC ( arbel, "Arbel %p firmware version %d.%d.%d\n", arbel,
 	       MLX_GET ( &fw, fw_rev_major ), MLX_GET ( &fw, fw_rev_minor ),
 	       MLX_GET ( &fw, fw_rev_subminor ) );
 	fw_pages = MLX_GET ( &fw, fw_pages );
diff --git a/src/drivers/infiniband/hermon.c b/src/drivers/infiniband/hermon.c
index 01eab3960..44f0e2d5e 100644
--- a/src/drivers/infiniband/hermon.c
+++ b/src/drivers/infiniband/hermon.c
@@ -1086,7 +1086,7 @@ static int hermon_post_send ( struct ib_device *ibdev,
 
 	/* Ring doorbell register */
 	MLX_FILL_1 ( &db_reg.send, 0, qn, qp->qpn );
-	DBGCP ( hermon, "Ringing doorbell %08lx with %08lx\n",
+	DBGCP ( hermon, "Ringing doorbell %08lx with %08x\n",
 		virt_to_phys ( hermon_send_wq->doorbell ), db_reg.dword[0] );
 	writel ( db_reg.dword[0], ( hermon_send_wq->doorbell ) );
 
@@ -1172,7 +1172,7 @@ static int hermon_complete ( struct ib_device *ibdev,
 	if ( opcode >= HERMON_OPCODE_RECV_ERROR ) {
 		/* "s" field is not valid for error opcodes */
 		is_send = ( opcode == HERMON_OPCODE_SEND_ERROR );
-		DBGC ( hermon, "Hermon %p CQN %lx syndrome %lx vendor %lx\n",
+		DBGC ( hermon, "Hermon %p CQN %lx syndrome %x vendor %x\n",
 		       hermon, cq->cqn, MLX_GET ( &cqe->error, syndrome ),
 		       MLX_GET ( &cqe->error, vendor_error_syndrome ) );
 		rc = -EIO;
@@ -1473,7 +1473,7 @@ static void hermon_poll_eq ( struct ib_device *ibdev ) {
 		/* Ring doorbell */
 		MLX_FILL_1 ( &db_reg.event, 0,
 			     ci, ( hermon_eq->next_idx & 0x00ffffffUL ) );
-		DBGCP ( hermon, "Ringing doorbell %08lx with %08lx\n",
+		DBGCP ( hermon, "Ringing doorbell %08lx with %08x\n",
 			virt_to_phys ( hermon_eq->doorbell ),
 			db_reg.dword[0] );
 		writel ( db_reg.dword[0], hermon_eq->doorbell );
@@ -1714,7 +1714,7 @@ static int hermon_start_firmware ( struct hermon *hermon ) {
 		       hermon, strerror ( rc ) );
 		goto err_query_fw;
 	}
-	DBGC ( hermon, "Hermon %p firmware version %ld.%ld.%ld\n", hermon,
+	DBGC ( hermon, "Hermon %p firmware version %d.%d.%d\n", hermon,
 	       MLX_GET ( &fw, fw_rev_major ), MLX_GET ( &fw, fw_rev_minor ),
 	       MLX_GET ( &fw, fw_rev_subminor ) );
 	fw_pages = MLX_GET ( &fw, fw_pages );
diff --git a/src/drivers/infiniband/ib_packet.c b/src/drivers/infiniband/ib_packet.c
index 747213379..0f21617fb 100644
--- a/src/drivers/infiniband/ib_packet.c
+++ b/src/drivers/infiniband/ib_packet.c
@@ -222,7 +222,7 @@ int ib_pull ( struct ib_device *ibdev, struct io_buffer *iobuf,
 		}
 	}
 
-	DBGC2 ( ibdev, "IBDEV %p RX %04x:%08lx <= %04x:%08lx (key %08lx)\n",
+	DBGC2 ( ibdev, "IBDEV %p RX %04x:%08lx <= %04x:%08lx (key %08x)\n",
 		ibdev, lid,
 		( IB_LID_MULTICAST( lid ) ? ( qp ? (*qp)->qpn : -1UL ) : qpn ),
 		av->lid, av->qpn, ntohl ( deth->qkey ) );
diff --git a/src/drivers/infiniband/ib_sma.c b/src/drivers/infiniband/ib_sma.c
index 9426c8f1e..2bd3a9e8c 100644
--- a/src/drivers/infiniband/ib_sma.c
+++ b/src/drivers/infiniband/ib_sma.c
@@ -269,7 +269,7 @@ static int ib_sma_mad ( struct ib_sma *sma, union ib_mad *mad ) {
 	int rc;
 
 	DBGC ( sma, "SMA %p received SMP with bv=%02x mc=%02x cv=%02x "
-	       "meth=%02x attr=%04x mod=%08lx\n", sma, hdr->base_version,
+	       "meth=%02x attr=%04x mod=%08x\n", sma, hdr->base_version,
 	       hdr->mgmt_class, hdr->class_version, hdr->method,
 	       ntohs ( hdr->attr_id ), ntohl ( hdr->attr_mod ) );
 	DBGC2_HDA ( sma, 0, mad, sizeof ( *mad ) );
diff --git a/src/drivers/infiniband/ib_smc.c b/src/drivers/infiniband/ib_smc.c
index c07a4fefb..af0c4ab9d 100644
--- a/src/drivers/infiniband/ib_smc.c
+++ b/src/drivers/infiniband/ib_smc.c
@@ -156,7 +156,7 @@ int ib_smc_update ( struct ib_device *ibdev, ib_local_mad_t local_mad ) {
 		return rc;
 	ibdev->pkey = ntohs ( smp->pkey_table.pkey[0] );
 
-	DBGC ( ibdev, "IBDEV %p port GID is %08lx:%08lx:%08lx:%08lx\n", ibdev,
+	DBGC ( ibdev, "IBDEV %p port GID is %08x:%08x:%08x:%08x\n", ibdev,
 	       htonl ( ibdev->gid.u.dwords[0] ),
 	       htonl ( ibdev->gid.u.dwords[1] ),
 	       htonl ( ibdev->gid.u.dwords[2] ),
diff --git a/src/drivers/infiniband/linda.c b/src/drivers/infiniband/linda.c
index 170eec47e..b2f9e2abf 100644
--- a/src/drivers/infiniband/linda.c
+++ b/src/drivers/infiniband/linda.c
@@ -129,7 +129,7 @@ static void linda_readq ( struct linda *linda, uint32_t *dwords,
 			       "movq %%mm0, (%0)\n\t"
 			       : : "r" ( dwords ), "r" ( addr ) : "memory" );
 
-	DBGIO ( "[%08lx] => %08lx%08lx\n",
+	DBGIO ( "[%08lx] => %08x%08x\n",
 		virt_to_phys ( addr ), dwords[1], dwords[0] );
 }
 #define linda_readq( _linda, _ptr, _offset ) \
@@ -150,7 +150,7 @@ static void linda_writeq ( struct linda *linda, const uint32_t *dwords,
 			   unsigned long offset ) {
 	void *addr = ( linda->regs + offset );
 
-	DBGIO ( "[%08lx] <= %08lx%08lx\n",
+	DBGIO ( "[%08lx] <= %08x%08x\n",
 		virt_to_phys ( addr ), dwords[1], dwords[0] );
 
 	__asm__ __volatile__ ( "movq (%0), %%mm0\n\t"