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

Commit 0be930c5 authored by Olav Kongas's avatar Olav Kongas Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: isp116x-hcd: replace mdelay() by msleep() 



Replace mdelay() by msleep() in bus_suspend(); the rest of the system will
gain 7ms. The related code is reorganized to minimize the number of
locking/unlocking calls.

The last hunk of the patch is the formatting change by Lindent.

Signed-off-by: default avatarOlav Kongas <ok@artecdesign.ee>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e9aa795a

drivers/usb/host/isp116x-hcd.c

+11 −10
Original line number Diff line number Diff line
@@ -1420,20 +1420,22 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) 
	int ret = 0;



	spin_lock_irqsave(&isp116x->lock, flags);



	val = isp116x_read_reg32(isp116x, HCCONTROL);



	switch (val & HCCONTROL_HCFS) {

	case HCCONTROL_USB_OPER:

		spin_unlock_irqrestore(&isp116x->lock, flags);

		val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);

		val |= HCCONTROL_USB_SUSPEND;

		if (device_may_wakeup(&hcd->self.root_hub->dev))

			val |= HCCONTROL_RWE;

		/* Wait for usb transfers to finish */

		mdelay(2);

		msleep(2);

		spin_lock_irqsave(&isp116x->lock, flags);

		isp116x_write_reg32(isp116x, HCCONTROL, val);

		spin_unlock_irqrestore(&isp116x->lock, flags);

		/* Wait for devices to suspend */

		mdelay(5);

	case HCCONTROL_USB_SUSPEND:

		msleep(5);

		break;

	case HCCONTROL_USB_RESUME:

		isp116x_write_reg32(isp116x, HCCONTROL,
@@ -1441,12 +1443,11 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) 
				    HCCONTROL_USB_RESET);

	case HCCONTROL_USB_RESET:

		ret = -EBUSY;

	default:		/* HCCONTROL_USB_SUSPEND */

		spin_unlock_irqrestore(&isp116x->lock, flags);

		break;

	default:

		ret = -EINVAL;

	}



	spin_unlock_irqrestore(&isp116x->lock, flags);

	return ret;

}