Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 848d5b91 authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: fix build error without CONFIG_USB_PHY 



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: default avatarPeter Chen <peter.chen@freescale.com>
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f797d37e

include/linux/usb/of.h

+10 −6
Original line number Diff line number Diff line
@@ -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 */