summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-06-17 19:43:13 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 14:31:09 -0700
commitfc0b721f27beb5464d9fb5e521f5cd68127dd14e (patch)
tree1aed52fe517cd666d05d22fe5c6d6d5cb922ed40
parent4baa74fe32f330d464d59a00d01980fd16a15ecc (diff)
downloadop-kernel-dev-fc0b721f27beb5464d9fb5e521f5cd68127dd14e.zip
op-kernel-dev-fc0b721f27beb5464d9fb5e521f5cd68127dd14e.tar.gz
usb: gadget: dummy_hcd: move common bits of suspend/resume into one function
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/dummy_hcd.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 6d189e1..1916360 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1030,34 +1030,33 @@ static int dummy_udc_remove (struct platform_device *pdev)
return 0;
}
-static int dummy_udc_suspend (struct platform_device *pdev, pm_message_t state)
+static void dummy_udc_pm(struct dummy *dum, struct dummy_hcd *dum_hcd,
+ int suspend)
{
- struct dummy *dum = platform_get_drvdata(pdev);
- struct dummy_hcd *dum_hcd;
-
- dev_dbg (&pdev->dev, "%s\n", __func__);
- dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
- spin_lock_irq (&dum->lock);
- dum->udc_suspended = 1;
+ spin_lock_irq(&dum->lock);
+ dum->udc_suspended = suspend;
set_link_state(dum_hcd);
- spin_unlock_irq (&dum->lock);
+ spin_unlock_irq(&dum->lock);
+}
+
+static int dummy_udc_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct dummy *dum = platform_get_drvdata(pdev);
+ struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
+ dev_dbg(&pdev->dev, "%s\n", __func__);
+ dummy_udc_pm(dum, dum_hcd, 1);
usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd));
return 0;
}
-static int dummy_udc_resume (struct platform_device *pdev)
+static int dummy_udc_resume(struct platform_device *pdev)
{
- struct dummy *dum = platform_get_drvdata(pdev);
- struct dummy_hcd *dum_hcd;
-
- dev_dbg (&pdev->dev, "%s\n", __func__);
- dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
- spin_lock_irq (&dum->lock);
- dum->udc_suspended = 0;
- set_link_state(dum_hcd);
- spin_unlock_irq (&dum->lock);
+ struct dummy *dum = platform_get_drvdata(pdev);
+ struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
+ dev_dbg(&pdev->dev, "%s\n", __func__);
+ dummy_udc_pm(dum, dum_hcd, 0);
usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd));
return 0;
}
OpenPOWER on IntegriCloud