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.

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Valentina Manea 2014-03-10 10:36:40 +02:00 committed by Greg Kroah-Hartman
parent 04f7bb9d36
commit 9b6f0c4b98
6 changed files with 70 additions and 70 deletions

View file

@ -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