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>
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 140a6a3..b55600a 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -366,7 +366,7 @@
#endif
};
-struct dev_state;
+struct usb_dev_state;
/* ----------------------------------------------------------------------- */
@@ -753,9 +753,9 @@
/* 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