Commit b5ea060f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: rename choose_configuration 



As it is global, give it a usb specific name in the global namespace.

Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 732bb9ee

drivers/usb/core/generic.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int is_activesync(struct usb_interface_descriptor *desc) 
		&& desc->bInterfaceProtocol == 1;

}



int choose_configuration(struct usb_device *udev)

int usb_choose_configuration(struct usb_device *udev)

{

	int i;

	int num_configs;
@@ -164,7 +164,7 @@ static int generic_probe(struct usb_device *udev) 
	if (udev->authorized == 0)

		dev_err(&udev->dev, "Device is not authorized for usage\n");

	else {

		c = choose_configuration(udev);

		c = usb_choose_configuration(udev);

		if (c >= 0) {

			err = usb_set_configuration(udev, c);

			if (err) {

drivers/usb/core/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ int usb_authorize_device(struct usb_device *usb_dev) 
	/* Choose and set the configuration.  This registers the interfaces

	 * with the driver core and lets interface drivers bind to them.

	 */

	c = choose_configuration(usb_dev);

	c = usb_choose_configuration(usb_dev);

	if (c >= 0) {

		result = usb_set_configuration(usb_dev, c);

		if (result) {

drivers/usb/core/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ extern int usb_get_device_descriptor(struct usb_device *dev, 
		unsigned int size);

extern char *usb_cache_string(struct usb_device *udev, int index);

extern int usb_set_configuration(struct usb_device *dev, int configuration);

extern int choose_configuration(struct usb_device *udev);

extern int usb_choose_configuration(struct usb_device *udev);



extern void usb_kick_khubd(struct usb_device *dev);

extern int usb_match_device(struct usb_device *dev,