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

Commit 625f6949 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

USB: remove interface parameter of usb_reset_composite_device 



From the current implementation of usb_reset_composite_device
function, the iface parameter is no longer useful. This function
doesn't do something special for the iface usb_interface,compared
with other interfaces in the usb_device. So remove the parameter
and fix the related caller.

Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 33578bd7

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void hid_reset(struct work_struct *work) 
		dev_dbg(&usbhid->intf->dev, "resetting device\n");

		rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);

		if (rc_lock >= 0) {

			rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf);

			rc = usb_reset_composite_device(hid_to_usb_dev(hid));

			if (rc_lock)

				usb_unlock_device(hid_to_usb_dev(hid));

		}

drivers/usb/core/devio.c

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static int proc_connectinfo(struct dev_state *ps, void __user *arg) 


static int proc_resetdevice(struct dev_state *ps)

{

	return usb_reset_composite_device(ps->dev, NULL);

	return usb_reset_composite_device(ps->dev);

}



static int proc_setintf(struct dev_state *ps, void __user *arg)

drivers/usb/core/hub.c

+3 −8
Original line number Diff line number Diff line
@@ -2712,7 +2712,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
#endif



		} else {

			status = usb_reset_composite_device(udev, NULL);

			status = usb_reset_composite_device(udev);

		}

		usb_unlock_device(udev);
@@ -2940,7 +2940,7 @@ static void hub_events(void) 
			dev_dbg (hub_dev, "resetting for error %d\n",

				hub->error);



			ret = usb_reset_composite_device(hdev, intf);

			ret = usb_reset_composite_device(hdev);

			if (ret) {

				dev_dbg (hub_dev,

					"error resetting hub: %d\n", ret);
@@ -3355,7 +3355,6 @@ EXPORT_SYMBOL_GPL(usb_reset_device); 
/**

 * usb_reset_composite_device - warn interface drivers and perform a USB port reset

 * @udev: device to reset (not in SUSPENDED or NOTATTACHED state)

 * @iface: interface bound to the driver making the request (optional)

 *

 * Warns all drivers bound to registered interfaces (using their pre_reset

 * method), performs the port reset, and then lets the drivers know that
@@ -3368,8 +3367,7 @@ EXPORT_SYMBOL_GPL(usb_reset_device); 
 * For calls that might not occur during probe(), drivers should lock

 * the device using usb_lock_device_for_reset().

 */

int usb_reset_composite_device(struct usb_device *udev,

		struct usb_interface *iface)

int usb_reset_composite_device(struct usb_device *udev)

{

	int ret;

	int i;
@@ -3385,9 +3383,6 @@ int usb_reset_composite_device(struct usb_device *udev, 
	/* Prevent autosuspend during the reset */

	usb_autoresume_device(udev);



	if (iface && iface->condition != USB_INTERFACE_BINDING)

		iface = NULL;



	if (config) {

		for (i = 0; i < config->desc.bNumInterfaces; ++i) {

			struct usb_interface *cintf = config->interface[i];

drivers/usb/storage/transport.c

+1 −2
Original line number Diff line number Diff line
@@ -1172,8 +1172,7 @@ int usb_stor_port_reset(struct us_data *us) 
			result = -EIO;

			US_DEBUGP("No reset during disconnect\n");

		} else {

			result = usb_reset_composite_device(

					us->pusb_dev, us->pusb_intf);

			result = usb_reset_composite_device(us->pusb_dev);

			US_DEBUGP("usb_reset_composite_device returns %d\n",

					result);

		}

include/linux/usb.h

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ extern int usb_lock_device_for_reset(struct usb_device *udev, 


/* USB port reset for device reinitialization */

extern int usb_reset_device(struct usb_device *dev);

extern int usb_reset_composite_device(struct usb_device *dev,

		struct usb_interface *iface);

extern int usb_reset_composite_device(struct usb_device *dev);



extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);