UPSTREAM: usb: of: fix build breakage on !OF
authorFelipe Balbi <balbi@ti.com>
Thu, 17 Dec 2015 15:55:41 +0000 (09:55 -0600)
committerWu Liang feng <wulf@rock-chips.com>
Mon, 12 Sep 2016 02:57:24 +0000 (10:57 +0800)
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.

Change-Id: I0e3594d2beb29273343dacf0af73f159ad30a35d
Fixes: 98bfb3946695 ("usb: of: add an api to get
dr_mode by the phy node")
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(cherry picked from commit be99c84300950e876074916b215b511f69f83d3b)

include/linux/usb/of.h

index 3805757dcdc26b18ca6c6ed393bc2e406ba9a7d9..974bce93aa28910918efa0127a40852223c4fcae 100644 (file)
@@ -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;
 }