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

USB: core: hub.c: use usb_control_msg_send() in a few places 



There are a few calls to usb_control_msg() that can be converted to use
usb_control_msg_send() instead, so do that in order to make the error
checking a bit simpler and the code smaller.

Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200914153756.3412156-5-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 297e84c0

drivers/usb/core/hub.c

+40 −59
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ static int get_hub_descriptor(struct usb_device *hdev, 
 */

static int clear_hub_feature(struct usb_device *hdev, int feature)

{

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

		USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature, 0, NULL, 0, 1000);

	return usb_control_msg_send(hdev, 0, USB_REQ_CLEAR_FEATURE, USB_RT_HUB,

				    feature, 0, NULL, 0, 1000);

}



/*
@@ -419,9 +419,8 @@ static int clear_hub_feature(struct usb_device *hdev, int feature) 
 */

int usb_clear_port_feature(struct usb_device *hdev, int port1, int feature)

{

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

		USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,

		NULL, 0, 1000);

	return usb_control_msg_send(hdev, 0, USB_REQ_CLEAR_FEATURE, USB_RT_PORT,

				    feature, port1, NULL, 0, 1000);

}



/*
@@ -429,9 +428,8 @@ int usb_clear_port_feature(struct usb_device *hdev, int port1, int feature) 
 */

static int set_port_feature(struct usb_device *hdev, int port1, int feature)

{

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

		USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port1,

		NULL, 0, 1000);

	return usb_control_msg_send(hdev, 0, USB_REQ_SET_FEATURE, USB_RT_PORT,

				    feature, port1, NULL, 0, 1000);

}



static char *to_led_name(int selector)
@@ -755,15 +753,14 @@ hub_clear_tt_buffer(struct usb_device *hdev, u16 devinfo, u16 tt) 
	/* Need to clear both directions for control ep */

	if (((devinfo >> 11) & USB_ENDPOINT_XFERTYPE_MASK) ==

			USB_ENDPOINT_XFER_CONTROL) {

		int status = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

		int status = usb_control_msg_send(hdev, 0,

						  HUB_CLEAR_TT_BUFFER, USB_RT_PORT,

						  devinfo ^ 0x8000, tt, NULL, 0, 1000);

		if (status)

			return status;

	}

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

			       HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,

			       tt, NULL, 0, 1000);

	return usb_control_msg_send(hdev, 0, HUB_CLEAR_TT_BUFFER, USB_RT_PORT,

				    devinfo, tt, NULL, 0, 1000);

}



/*
@@ -1049,11 +1046,10 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) 
	 */

	if (type != HUB_RESUME) {

		if (hdev->parent && hub_is_superspeed(hdev)) {

			ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

					HUB_SET_DEPTH, USB_RT_HUB,

			ret = usb_control_msg_send(hdev, 0, HUB_SET_DEPTH, USB_RT_HUB,

						   hdev->level - 1, 0, NULL, 0,

						   USB_CTRL_SET_TIMEOUT);

			if (ret < 0)

			if (ret)

				dev_err(hub->intfdev,

						"set hub depth failed\n");

		}
@@ -2329,13 +2325,10 @@ static int usb_enumerate_device_otg(struct usb_device *udev) 
		/* enable HNP before suspend, it's simpler */

		if (port1 == bus->otg_port) {

			bus->b_hnp_enable = 1;

			err = usb_control_msg(udev,

				usb_sndctrlpipe(udev, 0),

				USB_REQ_SET_FEATURE, 0,

				USB_DEVICE_B_HNP_ENABLE,

				0, NULL, 0,

				USB_CTRL_SET_TIMEOUT);

			if (err < 0) {

			err = usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, 0,

						   USB_DEVICE_B_HNP_ENABLE, 0,

						   NULL, 0, USB_CTRL_SET_TIMEOUT);

			if (err) {

				/*

				 * OTG MESSAGE: report errors here,

				 * customize to match your product.
@@ -2347,13 +2340,10 @@ static int usb_enumerate_device_otg(struct usb_device *udev) 
		} else if (desc->bLength == sizeof

				(struct usb_otg_descriptor)) {

			/* Set a_alt_hnp_support for legacy otg device */

			err = usb_control_msg(udev,

				usb_sndctrlpipe(udev, 0),

				USB_REQ_SET_FEATURE, 0,

				USB_DEVICE_A_ALT_HNP_SUPPORT,

				0, NULL, 0,

				USB_CTRL_SET_TIMEOUT);

			if (err < 0)

			err = usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, 0,

						   USB_DEVICE_A_ALT_HNP_SUPPORT, 0,

						   NULL, 0, USB_CTRL_SET_TIMEOUT);

			if (err)

				dev_err(&udev->dev,

					"set a_alt_hnp_support failed: %d\n",

					err);
@@ -3121,10 +3111,8 @@ int usb_disable_ltm(struct usb_device *udev) 
	if (!udev->actconfig)

		return 0;



	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

			USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,

			USB_DEVICE_LTM_ENABLE, 0, NULL, 0,

			USB_CTRL_SET_TIMEOUT);

	return usb_control_msg_send(udev, 0, USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,

				    USB_DEVICE_LTM_ENABLE, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);

}

EXPORT_SYMBOL_GPL(usb_disable_ltm);
@@ -3143,10 +3131,8 @@ void usb_enable_ltm(struct usb_device *udev) 
	if (!udev->actconfig)

		return;



	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

			USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,

			USB_DEVICE_LTM_ENABLE, 0, NULL, 0,

			USB_CTRL_SET_TIMEOUT);

	usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,

			     USB_DEVICE_LTM_ENABLE, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);

}

EXPORT_SYMBOL_GPL(usb_enable_ltm);
@@ -3163,16 +3149,13 @@ EXPORT_SYMBOL_GPL(usb_enable_ltm); 
static int usb_enable_remote_wakeup(struct usb_device *udev)

{

	if (udev->speed < USB_SPEED_SUPER)

		return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,

				USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0,

				USB_CTRL_SET_TIMEOUT);

		return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,

					    USB_DEVICE_REMOTE_WAKEUP, 0,

					    NULL, 0, USB_CTRL_SET_TIMEOUT);

	else

		return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,

		return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,

					    USB_INTRF_FUNC_SUSPEND,

				USB_INTRF_FUNC_SUSPEND_RW |

					USB_INTRF_FUNC_SUSPEND_LP,

					    USB_INTRF_FUNC_SUSPEND_RW | USB_INTRF_FUNC_SUSPEND_LP,

					    NULL, 0, USB_CTRL_SET_TIMEOUT);

}
@@ -3189,13 +3172,11 @@ static int usb_enable_remote_wakeup(struct usb_device *udev) 
static int usb_disable_remote_wakeup(struct usb_device *udev)

{

	if (udev->speed < USB_SPEED_SUPER)

		return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,

		return usb_control_msg_send(udev, 0, USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,

					    USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0,

					    USB_CTRL_SET_TIMEOUT);

	else

		return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,

		return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,

					    USB_INTRF_FUNC_SUSPEND, 0, NULL, 0,

					    USB_CTRL_SET_TIMEOUT);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE