linux-next: build failures after merge of the final tree (usb tree related)

Hi ,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from drivers/usb/host/ehci-platform.c:28:0:
drivers/usb/host/ehci.h: In function 'ehci_readl':
drivers/usb/host/ehci.h:662:3: error: implicit declaration of function 'readl_be' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h:663:3: error: implicit declaration of function 'readl' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h: In function 'ehci_writel':
drivers/usb/host/ehci.h:674:3: error: implicit declaration of function 'writel_be' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h:675:3: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]

Caused by commit 99f91934a907 ("USB: EHCI: make ehci-platform a separate
driver") from the usb tree.

I have reverted that commit for today.

I then got:

drivers/usb/chipidea/built-in.o: In function `ehci_init_driver':
(.opd+0x5a0): multiple definition of `ehci_init_driver'
drivers/usb/host/built-in.o:(.opd+0xb58): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_init_driver':
(.text+0x6528): multiple definition of `.ehci_init_driver'
drivers/usb/host/built-in.o:(.text+0x9eb4): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_suspend':
(.opd+0xc18): multiple definition of `ehci_suspend'
drivers/usb/host/built-in.o:(.opd+0x11d0): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_resume':
(.opd+0x1020): multiple definition of `ehci_resume'
drivers/usb/host/built-in.o:(.opd+0x1680): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_suspend':
(.text+0x100e4): multiple definition of `.ehci_suspend'
drivers/usb/host/built-in.o:(.text+0x13b00): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_resume':
(.text+0x17760): multiple definition of `.ehci_resume'
drivers/usb/host/built-in.o:(.text+0x1b498): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_setup':
(.opd+0x1128): multiple definition of `ehci_setup'
drivers/usb/host/built-in.o:(.opd+0x17a0): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_setup':
(.text+0x228f0): multiple definition of `.ehci_setup'
drivers/usb/host/built-in.o:(.text+0x266fc): first defined here

Which is caused by commit 3e0232039967 ("USB: EHCI: prepare to make
ehci-hcd a library module").

I have added the following patch to disable the chipidea driver for now:

From: Stephen Rothwell <redacted>
Date: Fri, 2 Nov 2012 16:59:55 +1100
Subject: [PATCH] usb: mark the chipidea broken for now

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/usb/chipidea/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig
index 1ea932a..26a239a 100644
--- a/drivers/usb/chipidea/Kconfig
+++ b/drivers/usb/chipidea/Kconfig

@@ -1,6 +1,7 @@
 config USB_CHIPIDEA
 	tristate "ChipIdea Highspeed Dual Role Controller"
 	depends on USB || USB_GADGET
+	depends on BROKEN
 	help
 	  Say Y here if your system has a dual role high speed USB
 	  controller based on ChipIdea silicon IP. Currently, only the

-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

On Fri, Nov 02, 2012 at 05:04:59PM +1100, Stephen Rothwell wrote:

Hi ,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from drivers/usb/host/ehci-platform.c:28:0:
drivers/usb/host/ehci.h: In function 'ehci_readl':
drivers/usb/host/ehci.h:662:3: error: implicit declaration of function 'readl_be' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h:663:3: error: implicit declaration of function 'readl' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h: In function 'ehci_writel':
drivers/usb/host/ehci.h:674:3: error: implicit declaration of function 'writel_be' [-Werror=implicit-function-declaration]
drivers/usb/host/ehci.h:675:3: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]

Caused by commit 99f91934a907 ("USB: EHCI: make ehci-platform a separate
driver") from the usb tree.

I have reverted that commit for today.

I then got:

drivers/usb/chipidea/built-in.o: In function `ehci_init_driver':
(.opd+0x5a0): multiple definition of `ehci_init_driver'
drivers/usb/host/built-in.o:(.opd+0xb58): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_init_driver':
(.text+0x6528): multiple definition of `.ehci_init_driver'
drivers/usb/host/built-in.o:(.text+0x9eb4): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_suspend':
(.opd+0xc18): multiple definition of `ehci_suspend'
drivers/usb/host/built-in.o:(.opd+0x11d0): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_resume':
(.opd+0x1020): multiple definition of `ehci_resume'
drivers/usb/host/built-in.o:(.opd+0x1680): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_suspend':
(.text+0x100e4): multiple definition of `.ehci_suspend'
drivers/usb/host/built-in.o:(.text+0x13b00): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_resume':
(.text+0x17760): multiple definition of `.ehci_resume'
drivers/usb/host/built-in.o:(.text+0x1b498): first defined here
drivers/usb/chipidea/built-in.o: In function `ehci_setup':
(.opd+0x1128): multiple definition of `ehci_setup'
drivers/usb/host/built-in.o:(.opd+0x17a0): first defined here
drivers/usb/chipidea/built-in.o: In function `.ehci_setup':
(.text+0x228f0): multiple definition of `.ehci_setup'
drivers/usb/host/built-in.o:(.text+0x266fc): first defined here

Which is caused by commit 3e0232039967 ("USB: EHCI: prepare to make
ehci-hcd a library module").

I have added the following patch to disable the chipidea driver for now:

Both of these should now be fixed in my tree.

thanks,

greg k-h