UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-08-02 22:44:27 -06:00
parent 732bb9ee81
commit b5ea060f1e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/core/generic.c
View File

@ -40,7 +40,7 @@ static int is_activesync(struct usb_interface_descriptor *desc)
&& desc->bInterfaceProtocol == 1; && desc->bInterfaceProtocol == 1;
} }
int choose_configuration(struct usb_device *udev) int usb_choose_configuration(struct usb_device *udev)
{ {
int i; int i;
int num_configs; int num_configs;
@ -164,7 +164,7 @@ static int generic_probe(struct usb_device *udev)
if (udev->authorized == 0) if (udev->authorized == 0)
dev_err(&udev->dev, "Device is not authorized for usage\n"); dev_err(&udev->dev, "Device is not authorized for usage\n");
else { else {
c = choose_configuration(udev); c = usb_choose_configuration(udev);
if (c >= 0) { if (c >= 0) {
err = usb_set_configuration(udev, c); err = usb_set_configuration(udev, c);
if (err) { if (err) {

2
drivers/usb/core/hub.c
View File

@ -1460,7 +1460,7 @@ int usb_authorize_device(struct usb_device *usb_dev)
/* Choose and set the configuration. This registers the interfaces /* Choose and set the configuration. This registers the interfaces
* with the driver core and lets interface drivers bind to them. * 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) { if (c >= 0) {
result = usb_set_configuration(usb_dev, c); result = usb_set_configuration(usb_dev, c);
if (result) { if (result) {

2
drivers/usb/core/usb.h
View File

@ -23,7 +23,7 @@ extern int usb_get_device_descriptor(struct usb_device *dev,
unsigned int size); unsigned int size);
extern char *usb_cache_string(struct usb_device *udev, int index); extern char *usb_cache_string(struct usb_device *udev, int index);
extern int usb_set_configuration(struct usb_device *dev, int configuration); 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 void usb_kick_khubd(struct usb_device *dev);
extern int usb_match_device(struct usb_device *dev, extern int usb_match_device(struct usb_device *dev,