diff options
| author | Jack Pham <jackp@codeaurora.org> | 2016-02-09 16:04:20 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:08:29 -0700 |
| commit | 01e29a02384b5bec041fc6a25ff2cc91022ce3b7 (patch) | |
| tree | 3b899518fc78f4d124dc47e400cfb245cb300a27 | |
| parent | 7a587d7f46e26316045280ad0cc28db03f27f818 (diff) | |
usb: dwc3-msm: Allow compilation when USB_GADGET=n
Fix link errors when USB_GADGET=n which causes dwc3/gadget.c
not to be built. These symbols are only used in the msm_ep_config/
unconfig functions so we can conditionally compile them.
Signed-off-by: Jack Pham <jackp@codeaurora.org>
| -rw-r--r-- | drivers/usb/dwc3/core.h | 9 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-msm.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 2e1a2a307bde..5fd15ebdc0e4 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1172,6 +1172,8 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state); int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, unsigned cmd, struct dwc3_gadget_ep_cmd_params *params); int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param); +void dwc3_gadget_enable_irq(struct dwc3 *dwc); +void dwc3_gadget_disable_irq(struct dwc3 *dwc); #else static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; } @@ -1193,6 +1195,10 @@ static inline int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param) { return 0; } +static inline void dwc3_gadget_enable_irq(struct dwc3 *dwc) +{ } +static inline void dwc3_gadget_disable_irq(struct dwc3 *dwc) +{ } #endif /* power management interface */ @@ -1229,9 +1235,6 @@ void dwc3_post_host_reset_core_init(struct dwc3 *dwc); int dwc3_event_buffers_setup(struct dwc3 *dwc); void dwc3_usb3_phy_suspend(struct dwc3 *dwc, int suspend); -void dwc3_gadget_enable_irq(struct dwc3 *dwc); -void dwc3_gadget_disable_irq(struct dwc3 *dwc); - extern void dwc3_set_notifier( void (*notify) (struct dwc3 *dwc3, unsigned event)); extern int dwc3_notify_event(struct dwc3 *dwc3, unsigned event); diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c index a969dadb284b..63ebb9153216 100644 --- a/drivers/usb/dwc3/dwc3-msm.c +++ b/drivers/usb/dwc3/dwc3-msm.c @@ -392,6 +392,7 @@ static inline bool dwc3_msm_is_superspeed(struct dwc3_msm *mdwc) return dwc3_msm_is_dev_superspeed(mdwc); } +#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) /** * Configure the DBM with the BAM's data fifo. * This function is called by the USB BAM Driver @@ -1429,6 +1430,8 @@ int msm_ep_unconfig(struct usb_ep *ep) return 0; } EXPORT_SYMBOL(msm_ep_unconfig); +#endif /* (CONFIG_USB_DWC3_GADGET) || (CONFIG_USB_DWC3_DUAL_ROLE) */ + static void dwc3_resume_work(struct work_struct *w); static void dwc3_restart_usb_work(struct work_struct *w) |