linux-kernel - [PATCH] usb: use of_usb_get_dr_mode_by

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20160914135126.3122728-1-arnd@arndb.de>
Date:   Wed, 14 Sep 2016 15:51:01 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:     Kishon Vijay Abraham I <kishon@...com>,
        Hans de Goede <hdegoede@...hat.com>,
        Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
        Jerome Brunet <jbrunet@...libre.com>,
        Arnd Bergmann <arnd@...db.de>, Felipe Balbi <balbi@...com>,
        Peter Chen <peter.chen@...escale.com>,
        Rob Herring <robh@...nel.org>, linux-usb@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH] usb: use of_usb_get_dr_mode_by_phy() inline helper without USB

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@...db.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