projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
gadget
/
f_hid.c
diff --git
a/drivers/usb/gadget/f_hid.c
b/drivers/usb/gadget/f_hid.c
index 1e00ff9866af83a233df62d917729889ec840a01..111b85ca7ac0971d8edc029aa8e5e5d53cac1656 100644
(file)
--- a/
drivers/usb/gadget/f_hid.c
+++ b/
drivers/usb/gadget/f_hid.c
@@
-142,7
+142,7
@@
static struct usb_descriptor_header *hidg_fs_descriptors[] = {
static ssize_t f_hidg_read(struct file *file, char __user *buffer,
size_t count, loff_t *ptr)
{
static ssize_t f_hidg_read(struct file *file, char __user *buffer,
size_t count, loff_t *ptr)
{
- struct f_hidg *hidg =
(struct f_hidg *)
file->private_data;
+ struct f_hidg *hidg = file->private_data;
char *tmp_buff = NULL;
unsigned long flags;
char *tmp_buff = NULL;
unsigned long flags;
@@
-200,7
+200,7
@@
static void f_hidg_req_complete(struct usb_ep *ep, struct usb_request *req)
static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
size_t count, loff_t *offp)
{
static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
size_t count, loff_t *offp)
{
- struct f_hidg *hidg =
(struct f_hidg *)
file->private_data;
+ struct f_hidg *hidg = file->private_data;
ssize_t status = -ENOMEM;
if (!access_ok(VERIFY_READ, buffer, count))
ssize_t status = -ENOMEM;
if (!access_ok(VERIFY_READ, buffer, count))
@@
-257,7
+257,7
@@
static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
static unsigned int f_hidg_poll(struct file *file, poll_table *wait)
{
static unsigned int f_hidg_poll(struct file *file, poll_table *wait)
{
- struct f_hidg *hidg =
(struct f_hidg *)
file->private_data;
+ struct f_hidg *hidg = file->private_data;
unsigned int ret = 0;
poll_wait(file, &hidg->read_queue, wait);
unsigned int ret = 0;
poll_wait(file, &hidg->read_queue, wait);
@@
-318,8
+318,6
@@
static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req)
spin_unlock(&hidg->spinlock);
wake_up(&hidg->read_queue);
spin_unlock(&hidg->spinlock);
wake_up(&hidg->read_queue);
-
- return;
}
static int hidg_setup(struct usb_function *f,
}
static int hidg_setup(struct usb_function *f,
@@
-413,8
+411,6
@@
static void hidg_disable(struct usb_function *f)
usb_ep_disable(hidg->in_ep);
hidg->in_ep->driver_data = NULL;
usb_ep_disable(hidg->in_ep);
hidg->in_ep->driver_data = NULL;
-
- return;
}
static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
}
static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)