linux-next: build failure after merge of the kbuild tree

[Stephen Rothwell]

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 arch/arm/plat-omap/dma.c:28:
arch/arm/plat-omap/dma.c:1452:26: error: expected ',' or ';' before 'DRIVER_NAME'
 MODULE_ALIAS("platform:" 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)
                              ^~~~~~~~~~~
arch/arm/plat-omap/dma.c:1452:1: note: in expansion of macro 'MODULE_ALIAS'
 MODULE_ALIAS("platform:" DRIVER_NAME);
 ^~~~~~~~~~~~

Presumably caused by commit

  6a26793a7891 ("moduleparam: Save information about built-in modules in separate file")

(since that is the only change from Friday, I thnk)

DRIVER_NAME is not defined and this kbuild tree change has exposed it.  It has been this way since commit

  f31cc9622d75 ("OMAP: DMA: Convert DMA library into platform driver")

From v2.6.38-rc1 in 2012.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 6 May 2019 08:35:02 +1000
Subject: [PATCH] arm: omap: remove unused MODULE_ALIAS from dma.c

DRIVER_NAME has nevern been defined, so this cannot have ever been used.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arm/plat-omap/dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index d4012d6c0dcb..4c6d9f4b43b7 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1449,7 +1449,7 @@ static void __exit omap_system_dma_exit(void)
 
 MODULE_DESCRIPTION("OMAP SYSTEM DMA DRIVER");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" DRIVER_NAME);
+// MODULE_ALIAS("platform:" DRIVER_NAME);
 MODULE_AUTHOR("Texas Instruments Inc");
 
 /*
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpKYV0i4d86m.pgp
Description: OpenPGP digital signature