diff options
| author | Valentina Manea <valentina.manea.m@gmail.com> | 2014-03-10 10:36:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-10 09:54:56 -0700 |
| commit | 9b6f0c4b98171f2a354e1e461fefa90ec2baafa6 (patch) | |
| tree | 33101906d35bc425e78ba6df8c6db18f9a371db1 /drivers/staging/usbip | |
| parent | 04f7bb9d36d46ac25e2ec9d3a92252585a942385 (diff) | |
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>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/stub_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c index 952743c752d..773d8ca07a0 100644 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c @@ -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; |