drivers: usb: gadget: 64-bit related type fixes

Change-Id: I2f9b12e1e0cdfe64ffe20db78d319a6221821184
Signed-off-by: Greg Hackmann <ghackmann@google.com>

diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index 092964c2b5061aaab5c761327c7b4fb094b1beec..73c6b2072d73f494d44910d30e528c22e4caa748 100644 (file)
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -552,10 +552,11 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
 {
        struct acc_dev *dev = fp->private_data;
        struct usb_request *req;
-       int r = count, xfer;
+       ssize_t r = count;
+       unsigned xfer;
        int ret = 0;
 
-       pr_debug("acc_read(%d)\n", count);
+       pr_debug("acc_read(%zu)\n", count);
 
        if (dev->disconnected)
                return -ENODEV;
@@ -596,7 +597,7 @@ requeue_req:
                if (req->actual == 0)
                        goto requeue_req;
 
-               pr_debug("rx %p %d\n", req, req->actual);
+               pr_debug("rx %p %u\n", req, req->actual);
                xfer = (req->actual < count) ? req->actual : count;
                r = xfer;
                if (copy_to_user(buf, req->buf, xfer))
@@ -605,7 +606,7 @@ requeue_req:
                r = -EIO;
 
 done:
-       pr_debug("acc_read returning %d\n", r);
+       pr_debug("acc_read returning %zd\n", r);
        return r;
 }
 
@@ -614,10 +615,11 @@ static ssize_t acc_write(struct file *fp, const char __user *buf,
 {
        struct acc_dev *dev = fp->private_data;
        struct usb_request *req = 0;
-       int r = count, xfer;
+       ssize_t r = count;
+       unsigned xfer;
        int ret;
 
-       pr_debug("acc_write(%d)\n", count);
+       pr_debug("acc_write(%zu)\n", count);
 
        if (!dev->online || dev->disconnected)
                return -ENODEV;
@@ -665,7 +667,7 @@ static ssize_t acc_write(struct file *fp, const char __user *buf,
        if (req)
                req_put(dev, &dev->tx_idle, req);
 
-       pr_debug("acc_write returning %d\n", r);
+       pr_debug("acc_write returning %zd\n", r);
        return r;
 }
 

diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 960d64fbd40beda6683006b49d86d2a03a6b6191..620aeaaf2d725930f66a773a15d33c5d94da4b89 100644 (file)
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -466,10 +466,11 @@ static ssize_t mtp_read(struct file *fp, char __user *buf,
        struct mtp_dev *dev = fp->private_data;
        struct usb_composite_dev *cdev = dev->cdev;
        struct usb_request *req;
-       int r = count, xfer;
+       ssize_t r = count;
+       unsigned xfer;
        int ret = 0;
 
-       DBG(cdev, "mtp_read(%d)\n", count);
+       DBG(cdev, "mtp_read(%zu)\n", count);
 
        if (count > MTP_BULK_BUFFER_SIZE)
                return -EINVAL;
@@ -533,7 +534,7 @@ done:
                dev->state = STATE_READY;
        spin_unlock_irq(&dev->lock);
 
-       DBG(cdev, "mtp_read returning %d\n", r);
+       DBG(cdev, "mtp_read returning %zd\n", r);
        return r;
 }
 
@@ -543,11 +544,12 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf,
        struct mtp_dev *dev = fp->private_data;
        struct usb_composite_dev *cdev = dev->cdev;
        struct usb_request *req = 0;
-       int r = count, xfer;
+       ssize_t r = count;
+       unsigned xfer;
        int sendZLP = 0;
        int ret;
 
-       DBG(cdev, "mtp_write(%d)\n", count);
+       DBG(cdev, "mtp_write(%zu)\n", count);
 
        spin_lock_irq(&dev->lock);
        if (dev->state == STATE_CANCELED) {
@@ -624,7 +626,7 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf,
                dev->state = STATE_READY;
        spin_unlock_irq(&dev->lock);
 
-       DBG(cdev, "mtp_write returning %d\n", r);
+       DBG(cdev, "mtp_write returning %zd\n", r);
        return r;
 }
 
@@ -823,7 +825,7 @@ static int mtp_send_event(struct mtp_dev *dev, struct mtp_event *event)
        int ret;
        int length = event->length;
 
-       DBG(dev->cdev, "mtp_send_event(%d)\n", event->length);
+       DBG(dev->cdev, "mtp_send_event(%zu)\n", event->length);
 
        if (length < 0 || length > INTR_BUFFER_SIZE)
                return -EINVAL;