tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Sam Ravnborg and committed by
David S. Miller 3f4528d6 90181136

+11 -11
+4 -4
drivers/block/sunvdc.c
··· 153 153 pkt.vdisk_block_size = port->vdisk_block_size; 154 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 157 pkt.xfer_mode, pkt.vdisk_block_size, pkt.max_xfer_size); 158 158 159 159 return vio_ldc_send(&port->vio, &pkt, sizeof(pkt)); ··· 164 164 struct vdc_port *port = to_vdc_port(vio); 165 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] " 168 - "xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n", 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[%llu]\n", 169 169 pkt->tag.stype, pkt->operations, 170 170 pkt->vdisk_size, pkt->vdisk_type, 171 171 pkt->xfer_mode, pkt->vdisk_block_size, ··· 753 753 754 754 err = -ENODEV; 755 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 757 vdev->dev_no); 758 758 goto err_out_release_mdesc; 759 759 }
+1 -1
drivers/char/hw_random/n2-drv.c
··· 482 482 int i; 483 483 484 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 486 i, np->test_buffer[i]); 487 487 } 488 488
+4 -4
drivers/net/sunvnet.c
··· 336 336 if (IS_ERR(desc)) 337 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 340 desc->hdr.state, desc->hdr.ack, 341 341 desc->size, desc->ncookies, 342 342 desc->cookies[0].cookie_addr, ··· 394 394 struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_RX_RING]; 395 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 398 pkt->tag.stype_env, pkt->seq, dr->rcv_nxt); 399 399 400 400 if (unlikely(pkt->tag.stype_env != VIO_DRING_DATA)) 401 401 return 0; 402 402 if (unlikely(pkt->seq != dr->rcv_nxt)) { 403 - printk(KERN_ERR PFX "RX out of sequence seq[0x%lx] " 404 - "rcv_nxt[0x%lx]\n", pkt->seq, dr->rcv_nxt); 403 + printk(KERN_ERR PFX "RX out of sequence seq[0x%llx] " 404 + "rcv_nxt[0x%llx]\n", pkt->seq, dr->rcv_nxt); 405 405 return 0; 406 406 } 407 407
+1 -1
drivers/sbus/char/display7seg.c
··· 214 214 215 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 218 op->node->full_name, 219 219 (regs & D7S_FLIP) ? " (FLIPPED)" : "", 220 220 op->resource[0].start,
+1 -1
sound/sparc/cs4231.c
··· 2057 2057 if (err) 2058 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 2061 card->shortname, 2062 2062 op->resource[0].start, 2063 2063 op->irqs[0]);