Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 9c63792a8134f756a66b70eafd48af34a1831f58..fbbe974661f2ab5191f82cd2d8d7b7d4867f1668 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1729,6 +1729,8 @@ static inline int usb_urb_dir_out(struct urb *urb)
        return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_OUT;
 }
 
+int usb_urb_ep_type_check(const struct urb *urb);
+
 void *usb_alloc_coherent(struct usb_device *dev, size_t size,
        gfp_t mem_flags, dma_addr_t *dma);
 void usb_free_coherent(struct usb_device *dev, size_t size,
@@ -1767,7 +1769,21 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
 extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype,
        unsigned char descindex, void *buf, int size);
 extern int usb_get_status(struct usb_device *dev,
-       int type, int target, void *data);
+       int recip, int type, int target, void *data);
+
+static inline int usb_get_std_status(struct usb_device *dev,
+       int recip, int target, void *data)
+{
+       return usb_get_status(dev, recip, USB_STATUS_TYPE_STANDARD, target,
+               data);
+}
+
+static inline int usb_get_ptm_status(struct usb_device *dev, void *data)
+{
+       return usb_get_status(dev, USB_RECIP_DEVICE, USB_STATUS_TYPE_PTM,
+               0, data);
+}
+
 extern int usb_string(struct usb_device *dev, int index,
        char *buf, size_t size);