Skip to content

Commit

Permalink
usbcore: rename struct dev_state to struct usb_dev_state
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Valentina Manea authored and Greg Kroah-Hartman committed Mar 10, 2014
1 parent 04f7bb9 commit 9b6f0c4
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 70 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/usbip/stub_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 9b6f0c4

Please sign in to comment.