[PATCH] usb: use of_usb_get_dr_mode_by_phy() inline helper without USB

[PATCH] usb: use of_usb_get_dr_mode_by_phy() inline helper without USB

[Arnd Bergmann]

We have had two new PHY drivers call of_usb_get_dr_mode_by_phy()
recently without having a dependency on CONFIG_USB_COMMON, resulting
in a link error:

ERROR: "of_usb_get_dr_mode_by_phy" [drivers/phy/phy-meson-usb2.ko] undefined!

I fixed up the first one (sun4i) by adding the dependency, but
if we get more of this, it's probably better to allow the PHY
drivers to build without the dependency.

This changes the guard around declarations so we only refer to
them when both CONFIG_OF and CONFIG_USB_COMMON are enabled,
which is the right thing for all of the first calls but not the
one that already has a correct check for USB_SUPPORT rather than
USB_COMMON.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5ed935458519 ("phy: meson: add USB2 PHY support for Meson8b and GXBB")
---
 include/linux/usb/of.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index 5ff9032ee1b4..3ed539626840 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -11,7 +11,7 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/phy.h>
 
-#if IS_ENABLED(CONFIG_OF)
+#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_COMMON)
 enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0);
 bool of_usb_host_tpl_support(struct device_node *np);
 int of_usb_update_otg_caps(struct device_node *np,
-- 
2.9.0

Re: [PATCH] usb: use of_usb_get_dr_mode_by_phy() inline helper without USB

[Arnd Bergmann]

On Wednesday, September 14, 2016 3:51:01 PM CEST Arnd Bergmann wrote:
> We have had two new PHY drivers call of_usb_get_dr_mode_by_phy()
> recently without having a dependency on CONFIG_USB_COMMON, resulting
> in a link error:
> 
> ERROR: "of_usb_get_dr_mode_by_phy" [drivers/phy/phy-meson-usb2.ko] undefined!
> 
> I fixed up the first one (sun4i) by adding the dependency, but
> if we get more of this, it's probably better to allow the PHY
> drivers to build without the dependency.
> 
> This changes the guard around declarations so we only refer to
> them when both CONFIG_OF and CONFIG_USB_COMMON are enabled,
> which is the right thing for all of the first calls but not the
> one that already has a correct check for USB_SUPPORT rather than
> USB_COMMON.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 5ed935458519 ("phy: meson: add USB2 PHY support for Meson8b and GXBB")
> 

Please hold off applying for now, the randconfig builder came up with a
new build failure after this one, I have to investigate tomorrow.

	Arnd