Commit 452785d0 authored by Ingo Molnar's avatar Ingo Molnar Committed by Greg Kroah-Hartman

headers/prep: usb: gadget: Fix namespace collision

Avoid namespace collision with dev_ioctl() and dev_open(), also provided by generic headers.
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f663729
...@@ -1242,7 +1242,7 @@ ep0_poll (struct file *fd, poll_table *wait) ...@@ -1242,7 +1242,7 @@ ep0_poll (struct file *fd, poll_table *wait)
return mask; return mask;
} }
static long dev_ioctl (struct file *fd, unsigned code, unsigned long value) static long gadget_dev_ioctl (struct file *fd, unsigned code, unsigned long value)
{ {
struct dev_data *dev = fd->private_data; struct dev_data *dev = fd->private_data;
struct usb_gadget *gadget = dev->gadget; struct usb_gadget *gadget = dev->gadget;
...@@ -1904,7 +1904,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) ...@@ -1904,7 +1904,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
} }
static int static int
dev_open (struct inode *inode, struct file *fd) gadget_dev_open (struct inode *inode, struct file *fd)
{ {
struct dev_data *dev = inode->i_private; struct dev_data *dev = inode->i_private;
int value = -EBUSY; int value = -EBUSY;
...@@ -1924,12 +1924,12 @@ dev_open (struct inode *inode, struct file *fd) ...@@ -1924,12 +1924,12 @@ dev_open (struct inode *inode, struct file *fd)
static const struct file_operations ep0_operations = { static const struct file_operations ep0_operations = {
.llseek = no_llseek, .llseek = no_llseek,
.open = dev_open, .open = gadget_dev_open,
.read = ep0_read, .read = ep0_read,
.write = dev_config, .write = dev_config,
.fasync = ep0_fasync, .fasync = ep0_fasync,
.poll = ep0_poll, .poll = ep0_poll,
.unlocked_ioctl = dev_ioctl, .unlocked_ioctl = gadget_dev_ioctl,
.release = dev_release, .release = dev_release,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment