Messages in this thread Patch in this message | | | Date | Mon, 6 May 2019 09:46:09 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the kbuild tree |
| |
Hi Masahiro,
After merging the kbuild tree, today's linux-next build (arm multi_v7_defconfig) failed like this:
In file included from include/linux/module.h:18, from drivers/mfd/omap-usb-tll.c:21: drivers/mfd/omap-usb-tll.c:462:26: error: expected ',' or ';' before 'USBHS_DRIVER_NAME' MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); ^~~~~~~~~~~~~~~~~ include/linux/moduleparam.h:26:47: note: in definition of macro '__MODULE_INFO' = __MODULE_INFO_PREFIX __stringify(tag) "=" info ^~~~ include/linux/module.h:164:30: note: in expansion of macro 'MODULE_INFO' #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias) ^~~~~~~~~~~ drivers/mfd/omap-usb-tll.c:462:1: note: in expansion of macro 'MODULE_ALIAS' MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); ^~~~~~~~~~~~
Caused by commit
6a26793a7891 ("moduleparam: Save information about built-in modules in separate file")
USBHS_DRIVER_NAME is not defined and this kbuild tree change has exposed it. It has been this way since commit
16fa3dc75c22 ("mfd: omap-usb-tll: HOST TLL platform driver")
From v3.7-rc1 in 2012.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 6 May 2019 09:39:14 +1000 Subject: [PATCH] mfd: omap: remove unused MODULE_ALIAS from omap-usb-tll.c
USBHS_DRIVER_NAME has never been defined, so this cannot have ever been used.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/mfd/omap-usb-tll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index 446713dbee27..1cc8937e8bec 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c @@ -459,7 +459,7 @@ EXPORT_SYMBOL_GPL(omap_tll_disable); MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>"); MODULE_AUTHOR("Roger Quadros <rogerq@ti.com>"); -MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); +// MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("usb tll driver for TI OMAP EHCI and OHCI controllers"); -- 2.20.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |