aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2009-01-06 16:20:38 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-06 16:20:38 -0500
commit3f4528d6e91cffde49894f5252e6657d420d3d74 (patch)
tree585447e1c2ab4f7fac35471672711734275cdbf4
parent9018113649348c689da107166c05d436cd52e7bf (diff)
sparc64: Fix unsigned long long warnings in drivers.
Fix warnings caused by the unsigned long long usage in sparc specific drivers. The drivers were considered sparc specific more or less from the filename alone. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/block/sunvdc.c8
-rw-r--r--drivers/char/hw_random/n2-drv.c2
-rw-r--r--drivers/net/sunvnet.c8
-rw-r--r--drivers/sbus/char/display7seg.c2
-rw-r--r--sound/sparc/cs4231.c2
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 953c0b83d758..5861e33efe63 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -153,7 +153,7 @@ static int vdc_send_attr(struct vio_driver_state *vio)
153 pkt.vdisk_block_size = port->vdisk_block_size; 153 pkt.vdisk_block_size = port->vdisk_block_size;
154 pkt.max_xfer_size = port->max_xfer_size; 154 pkt.max_xfer_size = port->max_xfer_size;
155 155
156 viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n", 156 viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n",
157 pkt.xfer_mode, pkt.vdisk_block_size, pkt.max_xfer_size); 157 pkt.xfer_mode, pkt.vdisk_block_size, pkt.max_xfer_size);
158 158
159 return vio_ldc_send(&port->vio, &pkt, sizeof(pkt)); 159 return vio_ldc_send(&port->vio, &pkt, sizeof(pkt));
@@ -164,8 +164,8 @@ static int vdc_handle_attr(struct vio_driver_state *vio, void *arg)
164 struct vdc_port *port = to_vdc_port(vio); 164 struct vdc_port *port = to_vdc_port(vio);
165 struct vio_disk_attr_info *pkt = arg; 165 struct vio_disk_attr_info *pkt = arg;
166 166
167 viodbg(HS, "GOT ATTR stype[0x%x] ops[%lx] disk_size[%lu] disk_type[%x] " 167 viodbg(HS, "GOT ATTR stype[0x%x] ops[%llx] disk_size[%llu] disk_type[%x] "
168 "xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n", 168 "xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n",
169 pkt->tag.stype, pkt->operations, 169 pkt->tag.stype, pkt->operations,
170 pkt->vdisk_size, pkt->vdisk_type, 170 pkt->vdisk_size, pkt->vdisk_type,
171 pkt->xfer_mode, pkt->vdisk_block_size, 171 pkt->xfer_mode, pkt->vdisk_block_size,
@@ -753,7 +753,7 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev,
753 753
754 err = -ENODEV; 754 err = -ENODEV;
755 if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) { 755 if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) {
756 printk(KERN_ERR PFX "Port id [%lu] too large.\n", 756 printk(KERN_ERR PFX "Port id [%llu] too large.\n",
757 vdev->dev_no); 757 vdev->dev_no);
758 goto err_out_release_mdesc; 758 goto err_out_release_mdesc;
759 } 759 }
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 8859aeac2d25..9b3e09cd41f9 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -482,7 +482,7 @@ static void n2rng_dump_test_buffer(struct n2rng *np)
482 int i; 482 int i;
483 483
484 for (i = 0; i < SELFTEST_BUFFER_WORDS; i++) 484 for (i = 0; i < SELFTEST_BUFFER_WORDS; i++)
485 dev_err(&np->op->dev, "Test buffer slot %d [0x%016lx]\n", 485 dev_err(&np->op->dev, "Test buffer slot %d [0x%016llx]\n",
486 i, np->test_buffer[i]); 486 i, np->test_buffer[i]);
487} 487}
488 488
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index 233f1cda36e5..611230fef2b6 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -336,7 +336,7 @@ static int vnet_walk_rx_one(struct vnet_port *port,
336 if (IS_ERR(desc)) 336 if (IS_ERR(desc))
337 return PTR_ERR(desc); 337 return PTR_ERR(desc);
338 338
339 viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%lx:%lx]\n", 339 viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%llx:%llx]\n",
340 desc->hdr.state, desc->hdr.ack, 340 desc->hdr.state, desc->hdr.ack,
341 desc->size, desc->ncookies, 341 desc->size, desc->ncookies,
342 desc->cookies[0].cookie_addr, 342 desc->cookies[0].cookie_addr,
@@ -394,14 +394,14 @@ static int vnet_rx(struct vnet_port *port, void *msgbuf)
394 struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_RX_RING]; 394 struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_RX_RING];
395 struct vio_driver_state *vio = &port->vio; 395 struct vio_driver_state *vio = &port->vio;
396 396
397 viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016lx] rcv_nxt[%016lx]\n", 397 viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016llx] rcv_nxt[%016llx]\n",
398 pkt->tag.stype_env, pkt->seq, dr->rcv_nxt); 398 pkt->tag.stype_env, pkt->seq, dr->rcv_nxt);
399 399
400 if (unlikely(pkt->tag.stype_env != VIO_DRING_DATA)) 400 if (unlikely(pkt->tag.stype_env != VIO_DRING_DATA))
401 return 0; 401 return 0;
402 if (unlikely(pkt->seq != dr->rcv_nxt)) { 402 if (unlikely(pkt->seq != dr->rcv_nxt)) {
403 printk(KERN_ERR PFX "RX out of sequence seq[0x%lx] " 403 printk(KERN_ERR PFX "RX out of sequence seq[0x%llx] "
404 "rcv_nxt[0x%lx]\n", pkt->seq, dr->rcv_nxt); 404 "rcv_nxt[0x%llx]\n", pkt->seq, dr->rcv_nxt);
405 return 0; 405 return 0;
406 } 406 }
407 407
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2550af4ae432..4431578d8c45 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -214,7 +214,7 @@ static int __devinit d7s_probe(struct of_device *op,
214 214
215 writeb(regs, p->regs); 215 writeb(regs, p->regs);
216 216
217 printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n", 217 printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",
218 op->node->full_name, 218 op->node->full_name,
219 (regs & D7S_FLIP) ? " (FLIPPED)" : "", 219 (regs & D7S_FLIP) ? " (FLIPPED)" : "",
220 op->resource[0].start, 220 op->resource[0].start,
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index d44bf98e965e..41c387587474 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2057,7 +2057,7 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev
2057 if (err) 2057 if (err)
2058 return err; 2058 return err;
2059 2059
2060 sprintf(card->longname, "%s at 0x%lx, irq %d", 2060 sprintf(card->longname, "%s at 0x%llx, irq %d",
2061 card->shortname, 2061 card->shortname,
2062 op->resource[0].start, 2062 op->resource[0].start,
2063 op->irqs[0]); 2063 op->irqs[0]);