Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: core: introduce a new usb_get_std_status() helper

This new helper is a simple wrapper around usb_get_status(). This
patch is in preparation to adding support for fetching PTM_STATUS
types. No functional changes.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Felipe Balbi and committed by
Greg Kroah-Hartman
d9e1e148 3c377ef1

+19 -12
+2 -2
drivers/staging/wlan-ng/hfa384x_usb.c
··· 2460 2460 * ok 2461 2461 */ 2462 2462 result = 2463 - usb_get_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_in, &status); 2463 + usb_get_std_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_in, &status); 2464 2464 if (result < 0) { 2465 2465 netdev_err(hw->wlandev->netdev, "Cannot get bulk in endpoint status.\n"); 2466 2466 goto done; ··· 2469 2469 netdev_err(hw->wlandev->netdev, "Failed to reset bulk in endpoint.\n"); 2470 2470 2471 2471 result = 2472 - usb_get_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_out, &status); 2472 + usb_get_std_status(hw->usb, USB_RECIP_ENDPOINT, hw->endp_out, &status); 2473 2473 if (result < 0) { 2474 2474 netdev_err(hw->wlandev->netdev, "Cannot get bulk out endpoint status.\n"); 2475 2475 goto done;
+2 -2
drivers/usb/core/driver.c
··· 1340 1340 int err; 1341 1341 u16 devstat; 1342 1342 1343 - err = usb_get_status(udev, USB_RECIP_DEVICE, 0, 1344 - &devstat); 1343 + err = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, 1344 + &devstat); 1345 1345 if (err) { 1346 1346 dev_err(&udev->dev, 1347 1347 "Failed to suspend device, error %d\n",
+4 -4
drivers/usb/core/hub.c
··· 1482 1482 /* power budgeting mostly matters with bus-powered hubs, 1483 1483 * and battery-powered root hubs (may provide just 8 mA). 1484 1484 */ 1485 - ret = usb_get_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus); 1485 + ret = usb_get_std_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus); 1486 1486 if (ret) { 1487 1487 message = "can't get hub status"; 1488 1488 goto fail; ··· 3279 3279 */ 3280 3280 if (status == 0) { 3281 3281 devstatus = 0; 3282 - status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus); 3282 + status = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, &devstatus); 3283 3283 3284 3284 /* If a normal resume failed, try doing a reset-resume */ 3285 3285 if (status && !udev->reset_resume && udev->persist_enabled) { ··· 3303 3303 if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) 3304 3304 status = usb_disable_remote_wakeup(udev); 3305 3305 } else { 3306 - status = usb_get_status(udev, USB_RECIP_INTERFACE, 0, 3306 + status = usb_get_std_status(udev, USB_RECIP_INTERFACE, 0, 3307 3307 &devstatus); 3308 3308 if (!status && devstatus & (USB_INTRF_STAT_FUNC_RW_CAP 3309 3309 | USB_INTRF_STAT_FUNC_RW)) ··· 4866 4866 && udev->bus_mA <= unit_load) { 4867 4867 u16 devstat; 4868 4868 4869 - status = usb_get_status(udev, USB_RECIP_DEVICE, 0, 4869 + status = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, 4870 4870 &devstat); 4871 4871 if (status) { 4872 4872 dev_dbg(&udev->dev, "get status %d ?\n", status);
+4 -4
drivers/usb/misc/usbtest.c
··· 1016 1016 /* FIXME fetch strings from at least the device descriptor */ 1017 1017 1018 1018 /* [9.4.5] get_status always works */ 1019 - retval = usb_get_status(udev, USB_RECIP_DEVICE, 0, dev->buf); 1019 + retval = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, dev->buf); 1020 1020 if (retval) { 1021 1021 dev_err(&iface->dev, "get dev status --> %d\n", retval); 1022 1022 return retval; ··· 1026 1026 * the device's remote wakeup feature ... if we can, test that here 1027 1027 */ 1028 1028 1029 - retval = usb_get_status(udev, USB_RECIP_INTERFACE, 1029 + retval = usb_get_std_status(udev, USB_RECIP_INTERFACE, 1030 1030 iface->altsetting[0].desc.bInterfaceNumber, dev->buf); 1031 1031 if (retval) { 1032 1032 dev_err(&iface->dev, "get interface status --> %d\n", retval); ··· 1615 1615 u16 status; 1616 1616 1617 1617 /* shouldn't look or act halted */ 1618 - retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status); 1618 + retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status); 1619 1619 if (retval < 0) { 1620 1620 ERROR(tdev, "ep %02x couldn't get no-halt status, %d\n", 1621 1621 ep, retval); ··· 1637 1637 u16 status; 1638 1638 1639 1639 /* should look and act halted */ 1640 - retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status); 1640 + retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status); 1641 1641 if (retval < 0) { 1642 1642 ERROR(tdev, "ep %02x couldn't get halt status, %d\n", 1643 1643 ep, retval);
+7
include/linux/usb.h
··· 1767 1767 unsigned char descindex, void *buf, int size); 1768 1768 extern int usb_get_status(struct usb_device *dev, 1769 1769 int recip, int target, void *data); 1770 + 1771 + static inline int usb_get_std_status(struct usb_device *dev, 1772 + int recip, int target, void *data) 1773 + { 1774 + return usb_get_status(dev, recip, target, data); 1775 + } 1776 + 1770 1777 extern int usb_string(struct usb_device *dev, int index, 1771 1778 char *buf, size_t size); 1772 1779