diff options
-rw-r--r-- | drivers/usb/core/message.c | 5 | ||||
-rw-r--r-- | include/linux/usb.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 7135e542679d..2f6009b0cffc 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -631,8 +631,8 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char | |||
631 | * Returns the number of bytes received on success, or else the status code | 631 | * Returns the number of bytes received on success, or else the status code |
632 | * returned by the underlying usb_control_msg() call. | 632 | * returned by the underlying usb_control_msg() call. |
633 | */ | 633 | */ |
634 | int usb_get_string(struct usb_device *dev, unsigned short langid, | 634 | static int usb_get_string(struct usb_device *dev, unsigned short langid, |
635 | unsigned char index, void *buf, int size) | 635 | unsigned char index, void *buf, int size) |
636 | { | 636 | { |
637 | int i; | 637 | int i; |
638 | int result; | 638 | int result; |
@@ -1488,7 +1488,6 @@ EXPORT_SYMBOL(usb_sg_wait); | |||
1488 | // synchronous control message convenience routines | 1488 | // synchronous control message convenience routines |
1489 | EXPORT_SYMBOL(usb_get_descriptor); | 1489 | EXPORT_SYMBOL(usb_get_descriptor); |
1490 | EXPORT_SYMBOL(usb_get_status); | 1490 | EXPORT_SYMBOL(usb_get_status); |
1491 | EXPORT_SYMBOL(usb_get_string); | ||
1492 | EXPORT_SYMBOL(usb_string); | 1491 | EXPORT_SYMBOL(usb_string); |
1493 | 1492 | ||
1494 | // synchronous calls that also maintain usbcore state | 1493 | // synchronous calls that also maintain usbcore state |
diff --git a/include/linux/usb.h b/include/linux/usb.h index 827cc6de5f5c..130d125fda12 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -1018,8 +1018,6 @@ extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype, | |||
1018 | unsigned char descindex, void *buf, int size); | 1018 | unsigned char descindex, void *buf, int size); |
1019 | extern int usb_get_status(struct usb_device *dev, | 1019 | extern int usb_get_status(struct usb_device *dev, |
1020 | int type, int target, void *data); | 1020 | int type, int target, void *data); |
1021 | extern int usb_get_string(struct usb_device *dev, | ||
1022 | unsigned short langid, unsigned char index, void *buf, int size); | ||
1023 | extern int usb_string(struct usb_device *dev, int index, | 1021 | extern int usb_string(struct usb_device *dev, int index, |
1024 | char *buf, size_t size); | 1022 | char *buf, size_t size); |
1025 | 1023 | ||