aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@parcelfarce.linux.theplanet.co.uk>2005-04-26 14:26:53 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-26 14:26:53 -0400
commit5330e9273e2b3e372b01bb1cb75be4364f02db78 (patch)
treec05def3f207bdfca1eb9fac67d01329dd033643e
parent97af11286d68e359f61579214ca7a7b4433fe458 (diff)
[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.c4
-rw-r--r--drivers/usb/misc/sisusbvga/sisusb.c2
-rw-r--r--drivers/usb/net/usbnet.c2
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)
322 case 730: 322 case 730:
323 case 740: 323 case 740:
324 case 750: 324 case 750:
325 Trace(TRACE_MEMORY,"private_data(%Zd)\n",sizeof(struct pwc_dec23_private)); 325 Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));
326 kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */ 326 kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */
327 break; 327 break;
328 case 645: 328 case 645:
@@ -1179,7 +1179,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,
1179 DECLARE_WAITQUEUE(wait, current); 1179 DECLARE_WAITQUEUE(wait, current);
1180 int bytes_to_read; 1180 int bytes_to_read;
1181 1181
1182 Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count); 1182 Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count);
1183 if (vdev == NULL) 1183 if (vdev == NULL)
1184 return -EFAULT; 1184 return -EFAULT;
1185 pdev = vdev->priv; 1185 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,
983 msgcount++; 983 msgcount++;
984 if (msgcount < 500) 984 if (msgcount < 500)
985 printk(KERN_ERR 985 printk(KERN_ERR
986 "sisusbvga[%d]: Wrote %Zd of " 986 "sisusbvga[%d]: Wrote %zd of "
987 "%d bytes, error %d\n", 987 "%d bytes, error %d\n",
988 sisusb->minor, *bytes_written, 988 sisusb->minor, *bytes_written,
989 length, ret); 989 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)
431 dev->stats.rx_bytes += skb->len; 431 dev->stats.rx_bytes += skb->len;
432 432
433 if (netif_msg_rx_status (dev)) 433 if (netif_msg_rx_status (dev))
434 devdbg (dev, "< rx, len %zd, type 0x%x", 434 devdbg (dev, "< rx, len %zu, type 0x%x",
435 skb->len + sizeof (struct ethhdr), skb->protocol); 435 skb->len + sizeof (struct ethhdr), skb->protocol);
436 memset (skb->cb, 0, sizeof (struct skb_data)); 436 memset (skb->cb, 0, sizeof (struct skb_data));
437 status = netif_rx (skb); 437 status = netif_rx (skb);