diff options
| -rw-r--r-- | drivers/usb/gadget/f_accessory.c | 8 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_audio_source.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_mtp.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c index ea46b69ba..0af20512a 100644 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c @@ -556,7 +556,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf, struct acc_dev *dev = fp->private_data; struct usb_request *req; ssize_t r = count; - unsigned xfer; + unsigned int xfer; int ret = 0; pr_debug("acc_read(%zu)\n", count); @@ -635,7 +635,7 @@ static ssize_t acc_write(struct file *fp, const char __user *buf, struct acc_dev *dev = fp->private_data; struct usb_request *req = 0; ssize_t r = count; - unsigned xfer; + unsigned int xfer; int ret; pr_debug("acc_write(%zu)\n", count); @@ -700,7 +700,7 @@ static ssize_t acc_write(struct file *fp, const char __user *buf, return r; } -static long acc_ioctl(struct file *fp, unsigned code, unsigned long value) +static long acc_ioctl(struct file *fp, unsigned int code, unsigned long value) { struct acc_dev *dev = fp->private_data; char *src = NULL; @@ -1097,7 +1097,7 @@ static void acc_hid_work(struct work_struct *data) } static int acc_function_set_alt(struct usb_function *f, - unsigned intf, unsigned alt) + unsigned int intf, unsigned int alt) { struct acc_dev *dev = func_to_dev(f); struct usb_composite_dev *cdev = f->config->cdev; diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c index c9b68967a..a76dd48a9 100644 --- a/drivers/usb/gadget/f_audio_source.c +++ b/drivers/usb/gadget/f_audio_source.c @@ -522,7 +522,7 @@ audio_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) return value; } -static int audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt) +static int audio_set_alt(struct usb_function *f, unsigned int intf, unsigned int alt) { struct audio_dev *audio = func_to_audio(f); struct usb_composite_dev *cdev = f->config->cdev; diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c index ec67da6d6..3071c2b9c 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/f_mtp.c @@ -147,7 +147,7 @@ struct mtp_dev { struct file *xfer_file; loff_t xfer_file_offset; int64_t xfer_file_length; - unsigned xfer_send_header; + unsigned int xfer_send_header; uint16_t xfer_command; uint32_t xfer_transaction_id; int xfer_result; @@ -876,7 +876,7 @@ static ssize_t mtp_read(struct file *fp, char __user *buf, struct usb_composite_dev *cdev = dev->cdev; struct usb_request *req; ssize_t r = count; - unsigned xfer; + unsigned int xfer; int ret = 0; DBG(cdev, "mtp_read(%zu)\n", count); @@ -1005,7 +1005,7 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf, struct usb_composite_dev *cdev = dev->cdev; struct usb_request *req = 0; ssize_t r = count; - unsigned xfer; + unsigned int xfer; int sendZLP = 0; int ret; @@ -1516,7 +1516,7 @@ static int mtp_send_event(struct mtp_dev *dev, struct mtp_event *event) return ret; } -static long mtp_ioctl(struct file *fp, unsigned code, unsigned long value) +static long mtp_ioctl(struct file *fp, unsigned int code, unsigned long value) { struct mtp_dev *dev = fp->private_data; struct file *filp = NULL; @@ -2150,7 +2150,7 @@ mtp_function_unbind(struct usb_configuration *c, struct usb_function *f) } static int mtp_function_set_alt(struct usb_function *f, - unsigned intf, unsigned alt) + unsigned int intf, unsigned int alt) { struct mtp_dev *dev = func_to_mtp(f); struct usb_composite_dev *cdev = f->config->cdev; |