From: Felipe Balbi <balbi@ti.com>
Date: Thu, 17 Dec 2015 15:55:41 +0000 (-0600)
Subject: UPSTREAM: usb: of: fix build breakage on !OF
X-Git-Tag: firefly_0821_release~1559
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fdfae6cb796865ef2d6eb0a5d15237f41ca7d5a;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: 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.

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)
---

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;
 }