diff options
| author | Al Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2005-04-26 20:26:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 20:26:53 +0200 |
| commit | 5330e9273e2b3e372b01bb1cb75be4364f02db78 (patch) | |
| tree | c05def3f207bdfca1eb9fac67d01329dd033643e | |
| parent | Automatic merge of kernel.org:/home/rmk/linux-2.6-serial.git (diff) | |
| download | linux-5330e9273e2b3e372b01bb1cb75be4364f02db78.tar.xz linux-5330e9273e2b3e372b01bb1cb75be4364f02db78.zip | |
[PATCH] size_t portability fixes - drivers/usb
size_t is zu, ssize_t is zd...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 4 | ||||
| -rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 2 | ||||
| -rw-r--r-- | drivers/usb/net/usbnet.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index c3c3e5a101d9..c53e2263b7fb 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c @@ -322,7 +322,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) case 730: case 740: case 750: - Trace(TRACE_MEMORY,"private_data(%Zd)\n",sizeof(struct pwc_dec23_private)); + Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private)); kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */ break; case 645: @@ -1179,7 +1179,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf, DECLARE_WAITQUEUE(wait, current); int bytes_to_read; - Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count); + Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count); if (vdev == NULL) return -EFAULT; pdev = vdev->priv; diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 4bdbd0cf6cb8..2fd12264fd53 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -983,7 +983,7 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr, msgcount++; if (msgcount < 500) printk(KERN_ERR - "sisusbvga[%d]: Wrote %Zd of " + "sisusbvga[%d]: Wrote %zd of " "%d bytes, error %d\n", sisusb->minor, *bytes_written, length, ret); diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 1748159e462e..a45ea7c97356 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c @@ -431,7 +431,7 @@ static void skb_return (struct usbnet *dev, struct sk_buff *skb) dev->stats.rx_bytes += skb->len; if (netif_msg_rx_status (dev)) - devdbg (dev, "< rx, len %zd, type 0x%x", + devdbg (dev, "< rx, len %zu, type 0x%x", skb->len + sizeof (struct ethhdr), skb->protocol); memset (skb->cb, 0, sizeof (struct skb_data)); status = netif_rx (skb); |