Merge tag 'efi-next-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

[linux-block.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 0a81e0f5beb4b173a4de0f3038de8e5b43502c82..25f8e62a30ecac5dcf9463102966e4b5d7938a6c 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -303,6 +303,11 @@ void usb_put_intf(struct usb_interface *intf);
 #define USB_MAXINTERFACES      32
 #define USB_MAXIADS            (USB_MAXINTERFACES/2)
 
+bool usb_check_bulk_endpoints(
+               const struct usb_interface *intf, const u8 *ep_addrs);
+bool usb_check_int_endpoints(
+               const struct usb_interface *intf, const u8 *ep_addrs);
+
 /*
  * USB Resume Timer: Every Host controller driver should drive the resume
  * signalling on the bus for the amount of time defined by this macro.
@@ -716,13 +721,12 @@ struct usb_device {
 
        unsigned long active_duration;
 
-#ifdef CONFIG_PM
        unsigned long connect_time;
 
        unsigned do_remote_wakeup:1;
        unsigned reset_resume:1;
        unsigned port_is_suspended:1;
-#endif
+
        struct wusb_dev *wusb_dev;
        int slot_id;
        struct usb2_lpm_parameters l1_params;