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

Commit 4eebed9a authored by Yuyang Du's avatar Yuyang Du Committed by Greg Kroah-Hartman
Browse files

usb: usbip: Remove unnecessary get_vdev() 



vhci_tx_urb() should be able to get the vhci_device from
its caller vhci_urb_enqueue(), instead of brutal-force
searching it.

Reviewed-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: default avatarYuyang Du <yuyang.du@intel.com>
Acked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65c7843c

drivers/usb/usbip/vhci_hcd.c

+2 −30
Original line number Diff line number Diff line
@@ -430,36 +430,8 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
	return retval;

}



static struct vhci_device *get_vdev(struct usb_device *udev)

static void vhci_tx_urb(struct urb *urb, struct vhci_device *vdev)

{

	struct platform_device *pdev;

	struct usb_hcd *hcd;

	struct vhci_hcd *vhci;

	int pdev_nr, rhport;



	if (!udev)

		return NULL;



	for (pdev_nr = 0; pdev_nr < vhci_num_controllers; pdev_nr++) {

		pdev = *(vhci_pdevs + pdev_nr);

		if (pdev == NULL)

			continue;

		hcd = platform_get_drvdata(pdev);

		if (hcd == NULL)

			continue;

		vhci = hcd_to_vhci(hcd);

		for (rhport = 0; rhport < VHCI_HC_PORTS; rhport++) {

			if (vhci->vdev[rhport].udev == udev)

				return &vhci->vdev[rhport];

		}

	}



	return NULL;

}



static void vhci_tx_urb(struct urb *urb)

{

	struct vhci_device *vdev = get_vdev(urb->dev);

	struct vhci_priv *priv;

	struct vhci_hcd *vhci;

	unsigned long flags;
@@ -601,7 +573,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, 
	}



out:

	vhci_tx_urb(urb);

	vhci_tx_urb(urb, vdev);

	spin_unlock_irqrestore(&vhci->lock, flags);



	return 0;