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

Commit ccdcf77a authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

[PATCH] ISP116x PM updates 



This makes the isp116x driver stop using usb_suspend_device() and
usb_resume_device() ... usbcore now calls to the root hub methods,
removing the need for this.  It also switches from keventd to khubd
for remote wakeup.  (Compile tested.)

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

 drivers/usb/host/isp116x-hcd.c |   29 ++++-------------------------
 drivers/usb/host/isp116x.h     |    1 -
 2 files changed, 4 insertions(+), 26 deletions(-)
parent a7f72abe

drivers/usb/host/isp116x-hcd.c

+4 −25
Original line number Original line Diff line number Diff line
@@ -638,7 +638,7 @@ static irqreturn_t isp116x_irq(struct usb_hcd *hcd, struct pt_regs *regs) 
				  + msecs_to_jiffies(20) + 1);

				  + msecs_to_jiffies(20) + 1);

		if (intstat & HCINT_RD) {

		if (intstat & HCINT_RD) {

			DBG("---- remote wakeup\n");

			DBG("---- remote wakeup\n");

			schedule_work(&isp116x->rh_resume);

			usb_hcd_resume_root_hub(hcd);

			ret = IRQ_HANDLED;

			ret = IRQ_HANDLED;

		}

		}

		irqstat &= ~HCuPINT_OPR;

		irqstat &= ~HCuPINT_OPR;
@@ -1263,22 +1263,12 @@ static int isp116x_hub_resume(struct usb_hcd *hcd) 
	return 0;

	return 0;

}

}





static void isp116x_rh_resume(void *_hcd)

{

	struct usb_hcd *hcd = _hcd;



	usb_resume_device(hcd->self.root_hub);

}





#else

#else





#define	isp116x_hub_suspend	NULL

#define	isp116x_hub_suspend	NULL

#define	isp116x_hub_resume	NULL

#define	isp116x_hub_resume	NULL





static void isp116x_rh_resume(void *_hcd)

{

}



#endif

#endif





/*-----------------------------------------------------------------*/

/*-----------------------------------------------------------------*/
@@ -1732,7 +1722,6 @@ static int __init isp116x_probe(struct device *dev) 
	isp116x->addr_reg = addr_reg;

	isp116x->addr_reg = addr_reg;

	spin_lock_init(&isp116x->lock);

	spin_lock_init(&isp116x->lock);

	INIT_LIST_HEAD(&isp116x->async);

	INIT_LIST_HEAD(&isp116x->async);

	INIT_WORK(&isp116x->rh_resume, isp116x_rh_resume, hcd);

	isp116x->board = dev->platform_data;

	isp116x->board = dev->platform_data;





	if (!isp116x->board) {

	if (!isp116x->board) {
@@ -1777,16 +1766,10 @@ static int __init isp116x_probe(struct device *dev) 
static int isp116x_suspend(struct device *dev, pm_message_t state)

static int isp116x_suspend(struct device *dev, pm_message_t state)

{

{

	int ret = 0;

	int ret = 0;

	struct usb_hcd *hcd = dev_get_drvdata(dev);





	VDBG("%s: state %x\n", __func__, state);

	VDBG("%s: state %x\n", __func__, state);





	ret = usb_suspend_device(hcd->self.root_hub);

	if (!ret) {

	dev->power.power_state = state;

	dev->power.power_state = state;

		INFO("%s suspended\n", hcd_name);

	} else

		ERR("%s suspend failed\n", hcd_name);





	return ret;

	return ret;

}

}
@@ -1797,15 +1780,11 @@ static int isp116x_suspend(struct device *dev, pm_message_t state) 
static int isp116x_resume(struct device *dev)

static int isp116x_resume(struct device *dev)

{

{

	int ret = 0;

	int ret = 0;

	struct usb_hcd *hcd = dev_get_drvdata(dev);





	VDBG("%s:  state %x\n", __func__, dev->power.power_state);

	VDBG("%s:  state %x\n", __func__, dev->power.power_state);





	ret = usb_resume_device(hcd->self.root_hub);

	if (!ret) {

	dev->power.power_state = PMSG_ON;

	dev->power.power_state = PMSG_ON;

		VDBG("%s resumed\n", (char *)hcd_name);



	}

	return ret;

	return ret;

}

}

drivers/usb/host/isp116x.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -253,7 +253,6 @@ static const int cc_to_error[16] = { 




struct isp116x {

struct isp116x {

	spinlock_t lock;

	spinlock_t lock;

	struct work_struct rh_resume;





	void __iomem *addr_reg;

	void __iomem *addr_reg;

	void __iomem *data_reg;

	void __iomem *data_reg;