Re: [PATCH 1/1] usb: fix build error without CONFIG_USB_PHY

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jun 19, 2013 at 10:11:05AM +0800, Peter Chen wrote:
> 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.chen@xxxxxxxxxxxxx>
> ---
>  include/linux/usb/of.h |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
> index e460a24..a0aa1c8 100644
> --- a/include/linux/usb/of.h
> +++ b/include/linux/usb/of.h
> @@ -11,18 +11,22 @@
>  #include <linux/usb/phy.h>
>  
>  #ifdef CONFIG_OF

let's use IS_ENABLED() here

> -enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np);
>  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 defined(CONFIG_OF) && defined(CONFIG_USB_PHY)

and here

> +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

Also, why can't the same problem happen with of_usb_get_dr_mode() ??

-- 
balbi

Attachment: signature.asc
Description: Digital signature


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux