Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

headers/prep: usb: gadget: Fix namespace collision

Avoid namespace collision with dev_ioctl() and dev_open(), also provided by generic headers.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ingo Molnar and committed by
Greg Kroah-Hartman
452785d0 0f663729

+4 -4
+4 -4
drivers/usb/gadget/legacy/inode.c
··· 1242 1242 return mask; 1243 1243 } 1244 1244 1245 - static long dev_ioctl (struct file *fd, unsigned code, unsigned long value) 1245 + static long gadget_dev_ioctl (struct file *fd, unsigned code, unsigned long value) 1246 1246 { 1247 1247 struct dev_data *dev = fd->private_data; 1248 1248 struct usb_gadget *gadget = dev->gadget; ··· 1904 1904 } 1905 1905 1906 1906 static int 1907 - dev_open (struct inode *inode, struct file *fd) 1907 + gadget_dev_open (struct inode *inode, struct file *fd) 1908 1908 { 1909 1909 struct dev_data *dev = inode->i_private; 1910 1910 int value = -EBUSY; ··· 1924 1924 static const struct file_operations ep0_operations = { 1925 1925 .llseek = no_llseek, 1926 1926 1927 - .open = dev_open, 1927 + .open = gadget_dev_open, 1928 1928 .read = ep0_read, 1929 1929 .write = dev_config, 1930 1930 .fasync = ep0_fasync, 1931 1931 .poll = ep0_poll, 1932 - .unlocked_ioctl = dev_ioctl, 1932 + .unlocked_ioctl = gadget_dev_ioctl, 1933 1933 .release = dev_release, 1934 1934 }; 1935 1935