diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-09-28 18:07:42 +0200 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-09-28 18:07:42 +0200 |
| commit | d67b04c734467e10be8a1943398d8532b2f38e76 (patch) | |
| tree | 9f6fb509ef76dcec1e03547e00223c3aa1e04b34 /drivers/usb | |
| parent | c52cba1c57a3f2ac6c11517b7965da469b4b8ac7 (diff) | |
ccwmx5x: Clean build with no PM support.
This fixes v40297.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-arc.c | 7 | ||||
| -rw-r--r-- | drivers/usb/otg/fsl_otg.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c index 9cb8a1ff52ba..09900be5897d 100644 --- a/drivers/usb/host/ehci-arc.c +++ b/drivers/usb/host/ehci-arc.c @@ -31,6 +31,8 @@ extern int usb_host_wakeup_irq(struct device *wkup_dev); extern void usb_host_set_wakeup(struct device *wkup_dev, bool para); + +#ifdef CONFIG_PM static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool enable) { if (enable) { @@ -43,6 +45,7 @@ static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool ena pdata->lowpower = enable; } +#endif static void fsl_usb_clk_gate(struct fsl_usb2_platform_data *pdata, bool enable) { @@ -369,6 +372,7 @@ static int ehci_fsl_reinit(struct ehci_hcd *ehci) return 0; } +#ifdef CONFIG_PM static int ehci_fsl_bus_suspend(struct usb_hcd *hcd) { int ret = 0; @@ -432,6 +436,7 @@ static int ehci_fsl_bus_resume(struct usb_hcd *hcd) return ret; } +#endif static void ehci_fsl_shutdown(struct usb_hcd *hcd) { @@ -521,8 +526,10 @@ static const struct hc_driver ehci_fsl_hc_driver = { */ .hub_status_data = ehci_hub_status_data, .hub_control = ehci_hub_control, +#ifdef CONFIG_PM .bus_suspend = ehci_fsl_bus_suspend, .bus_resume = ehci_fsl_bus_resume, +#endif .relinquish_port = ehci_relinquish_port, .port_handed_over = ehci_port_handed_over, diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c index 4a48a02d62e0..4ee475fdf17c 100644 --- a/drivers/usb/otg/fsl_otg.c +++ b/drivers/usb/otg/fsl_otg.c @@ -682,7 +682,9 @@ static void fsl_otg_event(struct work_struct *work) struct otg_fsm *fsm = &og->fsm; struct otg_transceiver *otg = &og->otg; +#ifdef CONFIG_PM mutex_lock(&pm_mutex); +#endif b_session_irq_enable(false); otg->default_a = (fsm->id == 0); /* clear conn information */ @@ -703,7 +705,9 @@ static void fsl_otg_event(struct work_struct *work) b_session_irq_enable(false); fsl_otg_start_host(fsm, 1); } +#ifdef CONFIG_PM mutex_unlock(&pm_mutex); +#endif } /* B-device start SRP */ |