diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:44:43 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:44:42 -0800 |
| commit | 9660a520b9edd6d142e40e3b266f0ef8ff7b20a0 (patch) | |
| tree | db828646ceffd51e1e331725051d5355fd48e521 /include/linux | |
| parent | 81cd19901ee30010ab399ff22a5ba972984a77f0 (diff) | |
| parent | e589cdf9015a48ce9515b0d8bb5d5a6f2413ee8e (diff) | |
Merge "USB: dwc3-msm: Perform DBM config/unconfig under spinlock protection"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/msm_hsusb.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 1eb442f8dc6c..21fddf0cbf09 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h @@ -296,8 +296,7 @@ static inline void msm_usb_irq_disable(bool disable) #endif #ifdef CONFIG_USB_DWC3_QCOM -int msm_ep_config(struct usb_ep *ep, struct usb_request *request, - gfp_t gfp_flags); +int msm_ep_config(struct usb_ep *ep, struct usb_request *request); int msm_ep_unconfig(struct usb_ep *ep); void dwc3_tx_fifo_resize_request(struct usb_ep *ep, bool qdss_enable); int msm_data_fifo_config(struct usb_ep *ep, phys_addr_t addr, u32 size, @@ -312,8 +311,7 @@ static inline int msm_data_fifo_config(struct usb_ep *ep, phys_addr_t addr, return -ENODEV; } -static inline int msm_ep_config(struct usb_ep *ep, struct usb_request *request, - gfp_t gfp_flags) +static inline int msm_ep_config(struct usb_ep *ep, struct usb_request *request) { return -ENODEV; } |