Hi, Bin Liu <b-liu@xxxxxx> writes: >>>> +enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *phy_np); >>>> 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) >>>> +{ >>>> + return USB_DR_MODE_UNKNOWN; >>>> +} >>>> static inline bool of_usb_host_tpl_support(struct device_node *np) >>>> { >>>> return false; >>>> >>> >>> >>> Hi Felipe, >>> >>> This commit in your testing/next causes compilation error: >>> >>> /home/johnyoun/linux/linux-usb/drivers/usb/common/common.c:143:18: error: redefinition of ‘of_usb_get_dr_mode_by_phy’ >>> enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *phy_np) >>> ^ >>> In file included from /home/johnyoun/linux/linux-usb/drivers/usb/common/common.c:18:0: >>> /home/johnyoun/linux/linux-usb/include/linux/usb/of.h:20:18: note: previous definition of ‘of_usb_get_dr_mode_by_phy’ was here >>> enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *phy_np) >>> ^ >>> make[4]: *** [drivers/usb/common/common.o] Error 1 >>> >>> >> >> >> I'm on non-OF config. >> >> Looks like the #ifdef CONFIG_OF should encompass the new function >> in the .c file. >> > > Thanks John for pointing it out. > > Felipe, > > Do you want me to send v6 or you will fix it in your tree? send me an incremental diff which I can meld into original patch. -- balbi
Attachment:
signature.asc
Description: PGP signature