Commit 3f4528d6 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90181136

drivers/block/sunvdc.c

+4 −4
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int vdc_send_attr(struct vio_driver_state *vio) 
	pkt.vdisk_block_size = port->vdisk_block_size;

	pkt.max_xfer_size = port->max_xfer_size;



	viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n",

	viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n",

	       pkt.xfer_mode, pkt.vdisk_block_size, pkt.max_xfer_size);



	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) 
	struct vdc_port *port = to_vdc_port(vio);

	struct vio_disk_attr_info *pkt = arg;



	viodbg(HS, "GOT ATTR stype[0x%x] ops[%lx] disk_size[%lu] disk_type[%x] "

	       "xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n",

	viodbg(HS, "GOT ATTR stype[0x%x] ops[%llx] disk_size[%llu] disk_type[%x] "

	       "xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n",

	       pkt->tag.stype, pkt->operations,

	       pkt->vdisk_size, pkt->vdisk_type,

	       pkt->xfer_mode, pkt->vdisk_block_size,
@@ -753,7 +753,7 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev, 


	err = -ENODEV;

	if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) {

		printk(KERN_ERR PFX "Port id [%lu] too large.\n",

		printk(KERN_ERR PFX "Port id [%llu] too large.\n",

		       vdev->dev_no);

		goto err_out_release_mdesc;

	}

drivers/char/hw_random/n2-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void n2rng_dump_test_buffer(struct n2rng *np) 
	int i;



	for (i = 0; i < SELFTEST_BUFFER_WORDS; i++)

		dev_err(&np->op->dev, "Test buffer slot %d [0x%016lx]\n",

		dev_err(&np->op->dev, "Test buffer slot %d [0x%016llx]\n",

			i, np->test_buffer[i]);

}

drivers/net/sunvnet.c

+4 −4
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int vnet_walk_rx_one(struct vnet_port *port, 
	if (IS_ERR(desc))

		return PTR_ERR(desc);



	viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%lx:%lx]\n",

	viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%llx:%llx]\n",

	       desc->hdr.state, desc->hdr.ack,

	       desc->size, desc->ncookies,

	       desc->cookies[0].cookie_addr,
@@ -394,14 +394,14 @@ static int vnet_rx(struct vnet_port *port, void *msgbuf) 
	struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_RX_RING];

	struct vio_driver_state *vio = &port->vio;



	viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016lx] rcv_nxt[%016lx]\n",

	viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016llx] rcv_nxt[%016llx]\n",

	       pkt->tag.stype_env, pkt->seq, dr->rcv_nxt);



	if (unlikely(pkt->tag.stype_env != VIO_DRING_DATA))

		return 0;

	if (unlikely(pkt->seq != dr->rcv_nxt)) {

		printk(KERN_ERR PFX "RX out of sequence seq[0x%lx] "

		       "rcv_nxt[0x%lx]\n", pkt->seq, dr->rcv_nxt);

		printk(KERN_ERR PFX "RX out of sequence seq[0x%llx] "

		       "rcv_nxt[0x%llx]\n", pkt->seq, dr->rcv_nxt);

		return 0;

	}

drivers/sbus/char/display7seg.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int __devinit d7s_probe(struct of_device *op, 


	writeb(regs,  p->regs);



	printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n", 

	printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",

	       op->node->full_name,

	       (regs & D7S_FLIP) ? " (FLIPPED)" : "",

	       op->resource[0].start,

sound/sparc/cs4231.c

+1 −1
Original line number Diff line number Diff line
@@ -2057,7 +2057,7 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev 
	if (err)

		return err;



	sprintf(card->longname, "%s at 0x%lx, irq %d",

	sprintf(card->longname, "%s at 0x%llx, irq %d",

		card->shortname,

		op->resource[0].start,

		op->irqs[0]);