Rename struct dev_state to struct usb_dev_state
cover Rename struct dev_state to struct usb_dev_state
Since it is needed outside usbcore and exposed in include/linux/usb.h, it conflicts with enum dev_state in rt2x00 wireless driver and breaks the build.
Mark it as usb specific to avoid conflicts in the future and update USB/IP to use the new name.
Valentina Manea (2):
usbcore: rename struct dev_state to struct usb_dev_state
staging: usbip: rename struct dev_state to usb_dev_state
drivers/staging/usbip/stub_dev.c | 4 +- drivers/usb/core/devio.c | 112 +++++++++++++++++++-------------------- drivers/usb/core/hub.c | 12 ++--- drivers/usb/core/hub.h | 2 +- drivers/usb/core/usb.h | 4 +- include/linux/usb.h | 6 +-- 6 files changed, 70 insertions(+), 70 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/2 usbcore: rename struct dev_state to struct usb_dev_state
Since it is needed outside usbcore and exposed in include/linux/usb.h, it conflicts with enum dev_state in rt2x00 wireless driver.
Mark it as usb specific to avoid conflicts in the future.
--- drivers/usb/core/devio.c | 112 +++++++++++++++++++++++------------------------ drivers/usb/core/hub.c | 12 ++--- drivers/usb/core/hub.h | 2 +- drivers/usb/core/usb.h | 4 +- include/linux/usb.h | 6 +-- 5 files changed, 68 insertions(+), 68 deletions(-)
drivers/usb/core/devio.c +56 -56
@@ -62,7 +62,7 @@/* Mutual exclusion for removal, open, and release */ DEFINE_MUTEX (usbfs_mutex); -struct dev_state { +struct usb_dev_state {struct list_head list;/* state list */ struct usb_device *dev;struct file *file;
@@ -81,7 +81,7 @@ struct dev_state {struct async {struct list_head asynclist; -struct dev_state *ps; +struct usb_dev_state *ps;struct pid *pid;const struct cred *cred;unsigned int signr;
@@ -151,7 +151,7 @@ static void usbfs_decrease_memory_usage(unsigned amount)atomic_sub (amount, &usbfs_memory_usage); } -static int connected (struct dev_state *ps) +static int connected (struct usb_dev_state *ps) {return (!list_empty (&ps->list) && ps->dev->state !=USB_STATE_NOTATTACHED );
@@ -184,7 +184,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)static ssize_t usbdev_read (struct file *file,char __user *buf,size_t nbytes,loff_t *ppos) { -struct dev_state *ps = file->private_data; +struct usb_dev_state *ps = file->private_data;struct usb_device *dev = ps->dev;ssize_t ret =0 ;unsigned len;
@@ -307,7 +307,7 @@ static void free_async(struct async *as)static void async_newpending (struct async *as) { -struct dev_state *ps = as->ps; +struct usb_dev_state *ps = as->ps;unsigned long flags;spin_lock_irqsave (&ps->lock, flags);
@@ -317,7 +317,7 @@ static void async_newpending(struct async *as)static void async_removepending (struct async *as) { -struct dev_state *ps = as->ps; +struct usb_dev_state *ps = as->ps;unsigned long flags;spin_lock_irqsave (&ps->lock, flags);
@@ -325,7 +325,7 @@ static void async_removepending(struct async *as)spin_unlock_irqrestore (&ps->lock, flags); } -static struct async *async_getcompleted (struct dev_state *ps) +static struct async *async_getcompleted (struct usb_dev_state *ps) {unsigned long flags;struct async *as =NULL ;
@@ -340,7 +340,7 @@ static struct async *async_getcompleted(struct dev_state *ps)return as; } -static struct async *async_getpending (struct dev_state *ps, +static struct async *async_getpending (struct usb_dev_state *ps,void __user *userurb) {struct async *as;
@@ -448,7 +448,7 @@ static int copy_urb_data_to_user(u8 __user *userbuffer, struct urb *urb)#define AS_CONTINUATION 1#define AS_UNLINK 2 -static void cancel_bulk_urbs (struct dev_state *ps,unsigned bulk_addr) +static void cancel_bulk_urbs (struct usb_dev_state *ps,unsigned bulk_addr) __releases(ps->lock) __acquires(ps->lock) {
@@ -489,7 +489,7 @@ __acquires(ps->lock)static void async_completed (struct urb *urb) {struct async *as = urb->context; -struct dev_state *ps = as->ps; +struct usb_dev_state *ps = as->ps;struct siginfo sinfo;struct pid *pid =NULL ;u32 secid =0 ;
@@ -529,7 +529,7 @@ static void async_completed(struct urb *urb)wake_up (&ps->wait); } -static void destroy_async (struct dev_state *ps,struct list_head *list) +static void destroy_async (struct usb_dev_state *ps,struct list_head *list) {struct urb *urb;struct async *as;
@@ -551,7 +551,7 @@ static void destroy_async(struct dev_state *ps, struct list_head *list)spin_unlock_irqrestore (&ps->lock, flags); } -static void destroy_async_on_interface (struct dev_state *ps, +static void destroy_async_on_interface (struct usb_dev_state *ps,unsigned int ifnum) {struct list_head *p, *q, hitlist;
@@ -566,7 +566,7 @@ static void destroy_async_on_interface(struct dev_state *ps,destroy_async (ps, &hitlist); } -static void destroy_all_async (struct dev_state *ps) +static void destroy_all_async (struct usb_dev_state *ps) {destroy_async (ps, &ps->async_pending); }
@@ -585,7 +585,7 @@ static int driver_probe(struct usb_interface *intf,static void driver_disconnect (struct usb_interface *intf) { -struct dev_state *ps =usb_get_intfdata (intf); +struct usb_dev_state *ps =usb_get_intfdata (intf);unsigned int ifnum = intf->altsetting->desc.bInterfaceNumber;if (!ps)
@@ -628,7 +628,7 @@ struct usb_driver usbfs_driver = { .resume = driver_resume, }; -static int claimintf (struct dev_state *ps,unsigned int ifnum) +static int claimintf (struct usb_dev_state *ps,unsigned int ifnum) {struct usb_device *dev = ps->dev;struct usb_interface *intf;
@@ -650,7 +650,7 @@ static int claimintf(struct dev_state *ps, unsigned int ifnum)return err; } -static int releaseintf (struct dev_state *ps,unsigned int ifnum) +static int releaseintf (struct usb_dev_state *ps,unsigned int ifnum) {struct usb_device *dev;struct usb_interface *intf;
@@ -670,7 +670,7 @@ static int releaseintf(struct dev_state *ps, unsigned int ifnum)return err; } -static int checkintf (struct dev_state *ps,unsigned int ifnum) +static int checkintf (struct usb_dev_state *ps,unsigned int ifnum) {if (ps->dev->state !=USB_STATE_CONFIGURED )return -EHOSTUNREACH ;
@@ -710,7 +710,7 @@ static int findintfep(struct usb_device *dev, unsigned int ep)return -ENOENT ; } -static int check_ctrlrecip (struct dev_state *ps,unsigned int requesttype, +static int check_ctrlrecip (struct usb_dev_state *ps,unsigned int requesttype,unsigned int request,unsigned int index) {int ret =0 ;
@@ -791,11 +791,11 @@ static struct usb_device *usbdev_lookup_by_devt(dev_t devt)static int usbdev_open (struct inode *inode,struct file *file) {struct usb_device *dev =NULL ; -struct dev_state *ps; +struct usb_dev_state *ps;int ret; ret = -ENOMEM ; - ps =kmalloc (sizeof (struct dev_state ),GFP_KERNEL ); + ps =kmalloc (sizeof (struct usb_dev_state ),GFP_KERNEL );if (!ps) goto out_free_ps;
@@ -852,7 +852,7 @@ static int usbdev_open(struct inode *inode, struct file *file)static int usbdev_release (struct inode *inode,struct file *file) { -struct dev_state *ps = file->private_data; +struct usb_dev_state *ps = file->private_data;struct usb_device *dev = ps->dev;unsigned int ifnum;struct async *as;
@@ -883,7 +883,7 @@ static int usbdev_release(struct inode *inode, struct file *file)return 0 ; } -static int proc_control (struct dev_state *ps,void __user *arg) +static int proc_control (struct usb_dev_state *ps,void __user *arg) {struct usb_device *dev = ps->dev;struct usbdevfs_ctrltransfer ctrl;
@@ -970,7 +970,7 @@ static int proc_control(struct dev_state *ps, void __user *arg)return ret; } -static int proc_bulk (struct dev_state *ps,void __user *arg) +static int proc_bulk (struct usb_dev_state *ps,void __user *arg) {struct usb_device *dev = ps->dev;struct usbdevfs_bulktransfer bulk;
@@ -1043,7 +1043,7 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)return ret; } -static int proc_resetep (struct dev_state *ps,void __user *arg) +static int proc_resetep (struct usb_dev_state *ps,void __user *arg) {unsigned int ep;int ret;
@@ -1060,7 +1060,7 @@ static int proc_resetep(struct dev_state *ps, void __user *arg)return 0 ; } -static int proc_clearhalt (struct dev_state *ps,void __user *arg) +static int proc_clearhalt (struct usb_dev_state *ps,void __user *arg) {unsigned int ep;int pipe;
@@ -1082,7 +1082,7 @@ static int proc_clearhalt(struct dev_state *ps, void __user *arg)return usb_clear_halt (ps->dev, pipe); } -static int proc_getdriver (struct dev_state *ps,void __user *arg) +static int proc_getdriver (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_getdriver gd;struct usb_interface *intf;
@@ -1101,7 +1101,7 @@ static int proc_getdriver(struct dev_state *ps, void __user *arg)return ret; } -static int proc_connectinfo (struct dev_state *ps,void __user *arg) +static int proc_connectinfo (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_connectinfo ci = { .devnum = ps->dev->devnum,
@@ -1113,12 +1113,12 @@ static int proc_connectinfo(struct dev_state *ps, void __user *arg)return 0 ; } -static int proc_resetdevice (struct dev_state *ps) +static int proc_resetdevice (struct usb_dev_state *ps) {return usb_reset_device (ps->dev); } -static int proc_setintf (struct dev_state *ps,void __user *arg) +static int proc_setintf (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_setinterface setintf;int ret;
@@ -1131,7 +1131,7 @@ static int proc_setintf(struct dev_state *ps, void __user *arg) setintf.altsetting); } -static int proc_setconfig (struct dev_state *ps,void __user *arg) +static int proc_setconfig (struct usb_dev_state *ps,void __user *arg) {int u;int status =0 ;
@@ -1179,7 +1179,7 @@ static int proc_setconfig(struct dev_state *ps, void __user *arg)return status; } -static int proc_do_submiturb (struct dev_state *ps,struct usbdevfs_urb *uurb, +static int proc_do_submiturb (struct usb_dev_state *ps,struct usbdevfs_urb *uurb,struct usbdevfs_iso_packet_desc __user *iso_frame_desc,void __user *arg) {
@@ -1508,7 +1508,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,return ret; } -static int proc_submiturb (struct dev_state *ps,void __user *arg) +static int proc_submiturb (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_urb uurb;
@@ -1520,7 +1520,7 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg) arg); } -static int proc_unlinkurb (struct dev_state *ps,void __user *arg) +static int proc_unlinkurb (struct usb_dev_state *ps,void __user *arg) {struct urb *urb;struct async *as;
@@ -1580,7 +1580,7 @@ err_out:return -EFAULT ; } -static struct async *reap_as (struct dev_state *ps) +static struct async *reap_as (struct usb_dev_state *ps) {DECLARE_WAITQUEUE (wait, current);struct async *as =NULL ;
@@ -1603,7 +1603,7 @@ static struct async *reap_as(struct dev_state *ps)return as; } -static int proc_reapurb (struct dev_state *ps,void __user *arg) +static int proc_reapurb (struct usb_dev_state *ps,void __user *arg) {struct async *as =reap_as (ps);if (as) {
@@ -1616,7 +1616,7 @@ static int proc_reapurb(struct dev_state *ps, void __user *arg)return -EIO ; } -static int proc_reapurbnonblock (struct dev_state *ps,void __user *arg) +static int proc_reapurbnonblock (struct usb_dev_state *ps,void __user *arg) {int retval;struct async *as;
@@ -1631,7 +1631,7 @@ static int proc_reapurbnonblock(struct dev_state *ps, void __user *arg) }#ifdef CONFIG_COMPAT -static int proc_control_compat (struct dev_state *ps, +static int proc_control_compat (struct usb_dev_state *ps,struct usbdevfs_ctrltransfer32 __user *p32) {struct usbdevfs_ctrltransfer __user *p;
@@ -1644,7 +1644,7 @@ static int proc_control_compat(struct dev_state *ps,return proc_control (ps, p); } -static int proc_bulk_compat (struct dev_state *ps, +static int proc_bulk_compat (struct usb_dev_state *ps,struct usbdevfs_bulktransfer32 __user *p32) {struct usbdevfs_bulktransfer __user *p;
@@ -1661,7 +1661,7 @@ static int proc_bulk_compat(struct dev_state *ps,return proc_bulk (ps, p); } -static int proc_disconnectsignal_compat (struct dev_state *ps,void __user *arg) +static int proc_disconnectsignal_compat (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_disconnectsignal32 ds;
@@ -1699,7 +1699,7 @@ static int get_urb32(struct usbdevfs_urb *kurb,return 0 ; } -static int proc_submiturb_compat (struct dev_state *ps,void __user *arg) +static int proc_submiturb_compat (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_urb uurb;
@@ -1745,7 +1745,7 @@ static int processcompl_compat(struct async *as, void __user * __user *arg)return 0 ; } -static int proc_reapurb_compat (struct dev_state *ps,void __user *arg) +static int proc_reapurb_compat (struct usb_dev_state *ps,void __user *arg) {struct async *as =reap_as (ps);if (as) {
@@ -1758,7 +1758,7 @@ static int proc_reapurb_compat(struct dev_state *ps, void __user *arg)return -EIO ; } -static int proc_reapurbnonblock_compat (struct dev_state *ps,void __user *arg) +static int proc_reapurbnonblock_compat (struct usb_dev_state *ps,void __user *arg) {int retval;struct async *as;
@@ -1775,7 +1775,7 @@ static int proc_reapurbnonblock_compat(struct dev_state *ps, void __user *arg)#endif -static int proc_disconnectsignal (struct dev_state *ps,void __user *arg) +static int proc_disconnectsignal (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_disconnectsignal ds;
@@ -1786,7 +1786,7 @@ static int proc_disconnectsignal(struct dev_state *ps, void __user *arg)return 0 ; } -static int proc_claiminterface (struct dev_state *ps,void __user *arg) +static int proc_claiminterface (struct usb_dev_state *ps,void __user *arg) {unsigned int ifnum;
@@ -1795,7 +1795,7 @@ static int proc_claiminterface(struct dev_state *ps, void __user *arg)return claimintf (ps, ifnum); } -static int proc_releaseinterface (struct dev_state *ps,void __user *arg) +static int proc_releaseinterface (struct usb_dev_state *ps,void __user *arg) {unsigned int ifnum;int ret;
@@ -1808,7 +1808,7 @@ static int proc_releaseinterface(struct dev_state *ps, void __user *arg)return 0 ; } -static int proc_ioctl (struct dev_state *ps,struct usbdevfs_ioctl *ctl) +static int proc_ioctl (struct usb_dev_state *ps,struct usbdevfs_ioctl *ctl) {int size;void *buf =NULL ;
@@ -1884,7 +1884,7 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)return retval; } -static int proc_ioctl_default (struct dev_state *ps,void __user *arg) +static int proc_ioctl_default (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_ioctl ctrl;
@@ -1894,7 +1894,7 @@ static int proc_ioctl_default(struct dev_state *ps, void __user *arg) }#ifdef CONFIG_COMPAT -static int proc_ioctl_compat (struct dev_state *ps,compat_uptr_t arg) +static int proc_ioctl_compat (struct usb_dev_state *ps,compat_uptr_t arg) {struct usbdevfs_ioctl32 __user *uioc;struct usbdevfs_ioctl ctrl;
@@ -1912,7 +1912,7 @@ static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg) }#endif -static int proc_claim_port (struct dev_state *ps,void __user *arg) +static int proc_claim_port (struct usb_dev_state *ps,void __user *arg) {unsigned portnum;int rc;
@@ -1926,7 +1926,7 @@ static int proc_claim_port(struct dev_state *ps, void __user *arg)return rc; } -static int proc_release_port (struct dev_state *ps,void __user *arg) +static int proc_release_port (struct usb_dev_state *ps,void __user *arg) {unsigned portnum;
@@ -1935,7 +1935,7 @@ static int proc_release_port(struct dev_state *ps, void __user *arg)return usb_hub_release_port (ps->dev, portnum, ps); } -static int proc_get_capabilities (struct dev_state *ps,void __user *arg) +static int proc_get_capabilities (struct usb_dev_state *ps,void __user *arg) {__u32 caps;
@@ -1951,7 +1951,7 @@ static int proc_get_capabilities(struct dev_state *ps, void __user *arg)return 0 ; } -static int proc_disconnect_claim (struct dev_state *ps,void __user *arg) +static int proc_disconnect_claim (struct usb_dev_state *ps,void __user *arg) {struct usbdevfs_disconnect_claim dc;struct usb_interface *intf;
@@ -1991,7 +1991,7 @@ static int proc_disconnect_claim(struct dev_state *ps, void __user *arg)static long usbdev_do_ioctl (struct file *file,unsigned int cmd,void __user *p) { -struct dev_state *ps = file->private_data; +struct usb_dev_state *ps = file->private_data;struct inode *inode =file_inode (file);struct usb_device *dev = ps->dev;int ret = -ENOTTY ;
@@ -2192,7 +2192,7 @@ static long usbdev_compat_ioctl(struct file *file, unsigned int cmd,static unsigned int usbdev_poll (struct file *file,struct poll_table_struct *wait) { -struct dev_state *ps = file->private_data; +struct usb_dev_state *ps = file->private_data;unsigned int mask =0 ;poll_wait (file, &ps->wait, wait);
@@ -2218,11 +2218,11 @@ const struct file_operations usbdev_file_operations = {static void usbdev_remove (struct usb_device *udev) { -struct dev_state *ps; +struct usb_dev_state *ps;struct siginfo sinfo;while (!list_empty (&udev->filelist)) { - ps = list_entry(udev->filelist.next, struct dev_state, list); + ps = list_entry(udev->filelist.next, struct usb_dev_state, list);destroy_all_async (ps);wake_up_all (&ps->wait);list_del_init (&ps->list);
drivers/usb/core/hub.c +6 -6
@@ -1788,7 +1788,7 @@ hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)* to one of these "claimed" ports, the program will "own" the device. */ static int find_port_owner (struct usb_device *hdev,unsigned port1, -struct dev_state ***ppowner) +struct usb_dev_state ***ppowner) {struct usb_hub *hub =usb_hub_to_struct_hub (hdev);
@@ -1806,10 +1806,10 @@ static int find_port_owner(struct usb_device *hdev, unsigned port1,/* In the following three functions, the caller must hold hdev's lock */ int usb_hub_claim_port (struct usb_device *hdev,unsigned port1, -struct dev_state *owner) +struct usb_dev_state *owner) {int rc; -struct dev_state **powner; +struct usb_dev_state **powner; rc =find_port_owner (hdev, port1, &powner);if (rc)
@@ -1822,10 +1822,10 @@ int usb_hub_claim_port(struct usb_device *hdev, unsigned port1,EXPORT_SYMBOL_GPL (usb_hub_claim_port);int usb_hub_release_port (struct usb_device *hdev,unsigned port1, -struct dev_state *owner) +struct usb_dev_state *owner) {int rc; -struct dev_state **powner; +struct usb_dev_state **powner; rc =find_port_owner (hdev, port1, &powner);if (rc)
@@ -1837,7 +1837,7 @@ int usb_hub_release_port(struct usb_device *hdev, unsigned port1, }EXPORT_SYMBOL_GPL (usb_hub_release_port); -void usb_hub_release_all_ports (struct usb_device *hdev,struct dev_state *owner) +void usb_hub_release_all_ports (struct usb_device *hdev,struct usb_dev_state *owner) {struct usb_hub *hub =usb_hub_to_struct_hub (hdev);int n;
drivers/usb/core/hub.h +1 -1
@@ -89,7 +89,7 @@ struct usb_hub {struct usb_port {struct usb_device *child;struct device dev; -struct dev_state *port_owner; +struct usb_dev_state *port_owner;enum usb_port_connect_type connect_type;u8 portnum;unsigned power_is_on:1 ;
drivers/usb/core/usb.h +2 -2
@@ -2,7 +2,7 @@#include <linux/acpi.h> struct usb_hub_descriptor ; -struct dev_state ; +struct usb_dev_state ;/* Functions local to drivers/usb/core/ */
@@ -58,7 +58,7 @@ extern void usb_forced_unbind_intf(struct usb_interface *intf);extern void usb_rebind_intf (struct usb_interface *intf);extern void usb_hub_release_all_ports (struct usb_device *hdev, -struct dev_state *owner); +struct usb_dev_state *owner);extern bool usb_device_is_owned (struct usb_device *udev);extern int usb_hub_init (void );
include/linux/usb.h +3 -3
@@ -366,7 +366,7 @@ struct usb_bus {#endif }; -struct dev_state ; +struct usb_dev_state ;/* ----------------------------------------------------------------------- */
@@ -753,9 +753,9 @@ extern struct usb_host_interface *usb_find_alt_setting(/* port claiming functions */ int usb_hub_claim_port (struct usb_device *hdev,unsigned port1, -struct dev_state *owner); +struct usb_dev_state *owner);int usb_hub_release_port (struct usb_device *hdev,unsigned port1, -struct dev_state *owner); +struct usb_dev_state *owner);/** * usb_make_path - returns stable device path in the usb tree
Signature · 1 line
1.8.1.2
Greg KH
maintainerRe: [PATCH 1/2] usbcore: rename struct dev_state to struct usb_dev_state
Quoted 6 lines · Valentina Manea
Since it is needed outside usbcore and exposed in
include/linux/usb.h, it conflicts with enumdev_statein rt2x00 wireless driver.Mark it as usb specific to avoid conflicts in the future.
Signed-off-by Valentina Manea <[email protected]>
With this patch, you break the usbip code, you can never have a patch that breaks the build :(
I'll merge both of these together to prevent this from happening.
thanks,
greg k-h
PATCH 2/2 staging: usbip: rename struct dev_state to usb_dev_state
In reply to Valentina Maneastruct dev_state definition in usbcore conflicted with enum dev_state definition in rt2x00 driver so it was renamed to usb_dev_state.
Update usbip for this change.
--- drivers/staging/usbip/stub_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/usbip/stub_dev.c +2 -2
@@ -395,7 +395,7 @@ static int stub_probe(struct usb_device *udev)* (struct dev_state) as long as it is unique. */ rc =usb_hub_claim_port (udev->parent, udev->portnum, - (struct dev_state *) udev); + (struct usb_dev_state *) udev);if (rc) {dev_dbg (&udev->dev,"unable to claim port\n" );return rc;
@@ -464,7 +464,7 @@ static void stub_disconnect(struct usb_device *udev)/* release port */ rc =usb_hub_release_port (udev->parent, udev->portnum, - (struct dev_state *) udev); + (struct usb_dev_state *) udev);if (rc) {dev_dbg (&udev->dev,"unable to release port\n" );return ;
Signature · 1 line
1.8.1.2