Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 94468783cd960aa14b22503dd59afd14efb785aa

Authored by Guenter Roeck
Committed by Greg Kroah-Hartman
1 parent eea88512f8
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register 

Commit 3fa4d734 (usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv)
changed the conditional around the declaration of usb_nop_xceiv_register
from
	#if defined(CONFIG_NOP_USB_XCEIV) ||
		(defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
to
	#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)

While that looks the same, it is semantically different. The first expression
is true if CONFIG_NOP_USB_XCEIV is built as module and if the including
code is built as module. The second expression is true if code depending on
CONFIG_NOP_USB_XCEIV if built as module or into the kernel.

As a result, the arm:allmodconfig build fails with

arch/arm/mach-omap2/built-in.o: In function `omap3_evm_init':
arch/arm/mach-omap2/board-omap3evm.c:703: undefined reference to
	`usb_nop_xceiv_register'

Fix the problem by reverting to the old conditional.

Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/linux/usb/usb_phy_gen_xceiv.h
Diff comments   View file @ 9446878
... ... @@ -12,7 +12,7 @@
12 12 unsigned int needs_reset:1;
13 13 };
14 14  
15   -#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
  15 +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
16 16 /* sometimes transceivers are accessed only through e.g. ULPI */
17 17 extern void usb_nop_xceiv_register(void);
18 18 extern void usb_nop_xceiv_unregister(void);