Peter Chen <peter.c...@freescale.com> writes:
> on i386:
>
> drivers/built-in.o: In function `ci_hdrc_probe':
> core.c:(.text+0x20446b): undefined reference to `of_usb_get_phy_mode'
>
> Signed-off-by: Peter Chen <peter.c...@freescale.com>
> Reported-by: Randy Dunlap <rdun...@infradead.org>
> Acked-by: Randy Dunlap <rdun...@infradead.org>
It's actually Felipe's turf, so needs either his ack or target his tree.
I'm ok with this.
FWIW,
Acked-by: Alexander Shishkin <alexander.shish...@linux.intel.com>
>
> ---
> Changes for v2:
> - Using IS_ENABLED to MACRO define
>
> include/linux/usb/of.h | 16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
> index e460a24..a0ef405 100644
> --- a/include/linux/usb/of.h
> +++ b/include/linux/usb/of.h
> @@ -10,19 +10,23 @@
> #include <linux/usb/otg.h>
> #include <linux/usb/phy.h>
>
> -#ifdef CONFIG_OF
> -enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np);
> +#if IS_ENABLED(CONFIG_OF)
> enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np);
> #else
> -static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node
> *np)
> +static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np)
> {
> - return USBPHY_INTERFACE_MODE_UNKNOWN;
> + return USB_DR_MODE_UNKNOWN;
> }
> +#endif
>
> -static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np)
> +#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_PHY)
> +enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np);
> +#else
> +static inline enum usb_phy_interface of_usb_get_phy_mode(struct device_node
> *np)
> {
> - return USB_DR_MODE_UNKNOWN;
> + return USBPHY_INTERFACE_MODE_UNKNOWN;
> }
> +
> #endif
>
> #endif /* __LINUX_USB_OF_H */
> --
> 1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
