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

Commit fb79a6da authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

usb: xhci: avoid unnecessary calculation 



No need to calculate remainder and length_field, if there is
no data phase of a control transfer.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80c47962

drivers/usb/host/xhci-ring.c

+10 −10
Original line number Diff line number Diff line
@@ -3237,7 +3237,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, 
	struct usb_ctrlrequest *setup;

	struct xhci_generic_trb *start_trb;

	int start_cycle;

	u32 field, length_field, remainder;

	u32 field;

	struct urb_priv *urb_priv;

	struct xhci_td *td;
@@ -3310,16 +3310,16 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, 
	else

		field = TRB_TYPE(TRB_DATA);



	if (urb->transfer_buffer_length > 0) {

		u32 length_field, remainder;



		remainder = xhci_td_remainder(xhci, 0,

				urb->transfer_buffer_length,

				urb->transfer_buffer_length,

				urb, 1);



		length_field = TRB_LEN(urb->transfer_buffer_length) |

				TRB_TD_SIZE(remainder) |

				TRB_INTR_TARGET(0);



	if (urb->transfer_buffer_length > 0) {

		if (setup->bRequestType & USB_DIR_IN)

			field |= TRB_DIR_IN;

		queue_trb(xhci, ep_ring, true,