Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e266a124 authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: drivers/usb/core/message.c: make usb_get_string() static 



After the removal of usb-midi.c, there's no longer any external user of
usb_get_string().

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9628416a

drivers/usb/core/message.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -631,7 +631,7 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char 
 * Returns the number of bytes received on success, or else the status code

 * Returns the number of bytes received on success, or else the status code

 * returned by the underlying usb_control_msg() call.

 * returned by the underlying usb_control_msg() call.

 */

 */

int usb_get_string(struct usb_device *dev, unsigned short langid,

static int usb_get_string(struct usb_device *dev, unsigned short langid,

			  unsigned char index, void *buf, int size)

			  unsigned char index, void *buf, int size)

{

{

	int i;

	int i;
@@ -1488,7 +1488,6 @@ EXPORT_SYMBOL(usb_sg_wait); 
// synchronous control message convenience routines

// synchronous control message convenience routines

EXPORT_SYMBOL(usb_get_descriptor);

EXPORT_SYMBOL(usb_get_descriptor);

EXPORT_SYMBOL(usb_get_status);

EXPORT_SYMBOL(usb_get_status);

EXPORT_SYMBOL(usb_get_string);

EXPORT_SYMBOL(usb_string);

EXPORT_SYMBOL(usb_string);





// synchronous calls that also maintain usbcore state

// synchronous calls that also maintain usbcore state

include/linux/usb.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -1018,8 +1018,6 @@ extern int usb_get_descriptor(struct usb_device *dev, unsigned char desctype, 
	unsigned char descindex, void *buf, int size);

	unsigned char descindex, void *buf, int size);

extern int usb_get_status(struct usb_device *dev,

extern int usb_get_status(struct usb_device *dev,

	int type, int target, void *data);

	int type, int target, void *data);

extern int usb_get_string(struct usb_device *dev,

	unsigned short langid, unsigned char index, void *buf, int size);

extern int usb_string(struct usb_device *dev, int index,

extern int usb_string(struct usb_device *dev, int index,

	char *buf, size_t size);

	char *buf, size_t size);