aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-12-17 09:55:41 -0600
committerFelipe Balbi <balbi@ti.com>2015-12-17 09:55:41 -0600
commitbe99c84300950e876074916b215b511f69f83d3b (patch)
tree27868c86e334c1a8612e797ebf766fbc40723cef /include/linux/usb
parentusb: gadget: inode.c: fix unbalanced spin_lock in ep0_write (diff)
downloadlinux-dev-be99c84300950e876074916b215b511f69f83d3b.tar.xz
linux-dev-be99c84300950e876074916b215b511f69f83d3b.zip
usb: of: fix build breakage on !OF
If OF is disabled, we will try to define a stub for of_usb_get_dr_mode_by_phy(), however that missed a static inline annotation which made us redefine the stub over and over again. Fix that. Fixes: 98bfb3946695 ("usb: of: add an api to get dr_mode by the phy node") Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/of.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index 3805757dcdc2..974bce93aa28 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -17,7 +17,8 @@ bool of_usb_host_tpl_support(struct device_node *np);
int of_usb_update_otg_caps(struct device_node *np,
struct usb_otg_caps *otg_caps);
#else
-enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *phy_np)
+static inline enum usb_dr_mode
+of_usb_get_dr_mode_by_phy(struct device_node *phy_np)
{
return USB_DR_MODE_UNKNOWN;
}