aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-10-09 11:19:24 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2014-03-04 18:38:03 -0500
commit8f5d35441ff26b31e3812556ce468c76f1eb216b (patch)
tree4d08632d96712d407ac40ab99557646582ff7a39
parent12d4bbcea727710bbd04de3e1de05957a0675e60 (diff)
usb-core: Move USB_MAXENDPOINTS definitions to usb.h
So that it can be used in other places too. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-rw-r--r--drivers/usb/core/config.c1
-rw-r--r--include/linux/usb.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 8d72f0c65937..14ba398d6def 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -10,7 +10,6 @@
10 10
11 11
12#define USB_MAXALTSETTING 128 /* Hard limit */ 12#define USB_MAXALTSETTING 128 /* Hard limit */
13#define USB_MAXENDPOINTS 30 /* Hard limit */
14 13
15#define USB_MAXCONFIG 8 /* Arbitrary limit */ 14#define USB_MAXCONFIG 8 /* Arbitrary limit */
16 15
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 7f6eb859873e..9b73dd782c09 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -202,6 +202,8 @@ static inline void usb_set_intfdata(struct usb_interface *intf, void *data)
202struct usb_interface *usb_get_intf(struct usb_interface *intf); 202struct usb_interface *usb_get_intf(struct usb_interface *intf);
203void usb_put_intf(struct usb_interface *intf); 203void usb_put_intf(struct usb_interface *intf);
204 204
205/* Hard limit */
206#define USB_MAXENDPOINTS 30
205/* this maximum is arbitrary */ 207/* this maximum is arbitrary */
206#define USB_MAXINTERFACES 32 208#define USB_MAXINTERFACES 32
207#define USB_MAXIADS (USB_MAXINTERFACES/2) 209#define USB_MAXIADS (USB_MAXINTERFACES/2)