2.6.21-rc2-mm1: drivers/net/wireless/ compile error

2.6.21-rc2-mm1: drivers/net/wireless/ compile error

[Adrian Bunk]

On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-mm2:
>...
>  git-wireless.patch
>...
>  git trees
>...

Multiple copies of the same drivers are a problem:

<--  snip  -->

...
  LD      drivers/net/wireless/built-in.o
drivers/net/wireless/mac80211/built-in.o: In function `zd_chip_switch_radio_on':
(.text+0x303b8): multiple definition of `zd_chip_switch_radio_on'
drivers/net/wireless/zd1211rw/built-in.o:(.text+0x1fc): first defined here
drivers/net/wireless/mac80211/built-in.o: In function `bcm43xx_dma_tx_suspend':
(.text+0x128b6): multiple definition of `bcm43xx_dma_tx_suspend'
drivers/net/wireless/bcm43xx/built-in.o:(.text+0x17d94): first defined here
...
make[4]: *** [drivers/net/wireless/built-in.o] Error 1

<--  snip  -->

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Adrian Bunk]

On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-mm2:
>...
>  git-wireless.patch
>...
>  git trees
>...

<--  snip  -->

...
  CC      drivers/usb/host/ohci-hcd.o
In file included from 
/home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
/home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union
/home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
/home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
/home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
...
make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1

<--  snip  -->


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.21-rc2-mm1: drivers/net/wireless/ compile error

[Michael Buesch]

On Monday 05 March 2007 02:47, Adrian Bunk wrote:
> On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.20-mm2:
> >...
> >  git-wireless.patch
> >...
> >  git trees
> >...
> 
> Multiple copies of the same drivers are a problem:
> 
> <--  snip  -->
> 
> ...
>   LD      drivers/net/wireless/built-in.o
> drivers/net/wireless/mac80211/built-in.o: In function `zd_chip_switch_radio_on':
> (.text+0x303b8): multiple definition of `zd_chip_switch_radio_on'
> drivers/net/wireless/zd1211rw/built-in.o:(.text+0x1fc): first defined here
> drivers/net/wireless/mac80211/built-in.o: In function `bcm43xx_dma_tx_suspend':
> (.text+0x128b6): multiple definition of `bcm43xx_dma_tx_suspend'
> drivers/net/wireless/bcm43xx/built-in.o:(.text+0x17d94): first defined here
> ...
> make[4]: *** [drivers/net/wireless/built-in.o] Error 1

Sure. You can't compile bcm43xx and bcm43xx-d80211 into the kernel.
This is going to be fixed by ripping out bcm43xx when bcm43xx-d80211 is merged.

-- 
Greetings Michael.

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Michael Buesch]

On Monday 05 March 2007 02:47, Adrian Bunk wrote:
> On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.20-mm2:
> >...
> >  git-wireless.patch
> >...
> >  git trees
> >...
> 
> <--  snip  -->
> 
> ...
>   CC      drivers/usb/host/ohci-hcd.o
> In file included from 
> /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
> /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union

Seems like there was a comma missing.
There also seems to be some Kconfig problem. will fix that.

> /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
> /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
> /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
> ...
> make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> 
> <--  snip  -->
> 
> 
> cu
> Adrian
> 

-- 
Greetings Michael.

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Michael Buesch]

On Monday 05 March 2007 11:49, Michael Buesch wrote:
> On Monday 05 March 2007 02:47, Adrian Bunk wrote:
> > On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> > >...
> > > Changes since 2.6.20-mm2:
> > >...
> > >  git-wireless.patch
> > >...
> > >  git trees
> > >...
> > 
> > <--  snip  -->
> > 
> > ...
> >   CC      drivers/usb/host/ohci-hcd.o
> > In file included from 
> > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
> > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union
> 
> Seems like there was a comma missing.
> There also seems to be some Kconfig problem. will fix that.
> 
> > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
> > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
> > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
> > ...
> > make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> > 
> > <--  snip  -->

Actually, it seems like I will run into other kinds of nasty problems
due to stupid design of the HCD code. The OHCI code #includes
the various drivers, which have a module_init each. So if you
compile PCI and SSB support, you have two module_init for one
OHCI module. Not sure how to fix this. Any idea?

-- 
Greetings Michael.

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Michael Buesch]

On Monday 05 March 2007 11:57, Michael Buesch wrote:
> > >   CC      drivers/usb/host/ohci-hcd.o
> > > In file included from 
> > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
> > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union
> > 
> > Seems like there was a comma missing.
> > There also seems to be some Kconfig problem. will fix that.
> > 
> > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
> > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
> > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
> > > ...
> > > make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> > > 
> > > <--  snip  -->
> 
> Actually, it seems like I will run into other kinds of nasty problems
> due to stupid design of the HCD code. The OHCI code #includes
> the various drivers, which have a module_init each. So if you
> compile PCI and SSB support, you have two module_init for one
> OHCI module. Not sure how to fix this. Any idea?

A real problem is that the HCD core seems to have the assumption
built-in that there can only be one OHCI driver per machine/arch.
That's not the case for SSB, where we can have both PCI and SSB
bus enabled, so both ohci drivers compiled.
Any idea? Greg perhaps?

Refactoring the code that OHCI drivers register to the HCD core
instead of hard-linking it in would fix the issue. But that's pretty
intrusive to do.

-- 
Greetings Michael.

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Greg KH]

On Mon, Mar 05, 2007 at 12:26:45PM +0100, Michael Buesch wrote:
> On Monday 05 March 2007 11:57, Michael Buesch wrote:
> > > >   CC      drivers/usb/host/ohci-hcd.o
> > > > In file included from 
> > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
> > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union
> > > 
> > > Seems like there was a comma missing.
> > > There also seems to be some Kconfig problem. will fix that.
> > > 
> > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
> > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
> > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
> > > > ...
> > > > make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> > > > 
> > > > <--  snip  -->
> > 
> > Actually, it seems like I will run into other kinds of nasty problems
> > due to stupid design of the HCD code. The OHCI code #includes
> > the various drivers, which have a module_init each. So if you
> > compile PCI and SSB support, you have two module_init for one
> > OHCI module. Not sure how to fix this. Any idea?
> 
> A real problem is that the HCD core seems to have the assumption
> built-in that there can only be one OHCI driver per machine/arch.
> That's not the case for SSB, where we can have both PCI and SSB
> bus enabled, so both ohci drivers compiled.
> Any idea? Greg perhaps?

David has provided hints on how to do this in the past on the
linux-usb-devel list if I remember correctly.

thanks,

greg k-h

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Adrian Bunk]

On Mon, Mar 05, 2007 at 10:26:10AM -0800, Greg KH wrote:
> On Mon, Mar 05, 2007 at 12:26:45PM +0100, Michael Buesch wrote:
> > On Monday 05 March 2007 11:57, Michael Buesch wrote:
> > > > >   CC      drivers/usb/host/ohci-hcd.o
> > > > > In file included from 
> > > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-hcd.c:931:
> > > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: request for member 'hcd_priv_size' in something not a structure or union
> > > > 
> > > > Seems like there was a comma missing.
> > > > There also seems to be some Kconfig problem. will fix that.
> > > > 
> > > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:47: error: 'ssb_ohci_device' undeclared here (not in a function)
> > > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:52: error: 'ssb_ohci_reset' undeclared here (not in a function)
> > > > > /home/bunk/linux/kernel-2.6/linux-2.6.21-rc2-mm1/drivers/usb/host/ohci-ssb.c:53: error: 'ssb_ohci_start' undeclared here (not in a function)
> > > > > ...
> > > > > make[4]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> > > > > 
> > > > > <--  snip  -->
> > > 
> > > Actually, it seems like I will run into other kinds of nasty problems
> > > due to stupid design of the HCD code. The OHCI code #includes
> > > the various drivers, which have a module_init each. So if you
> > > compile PCI and SSB support, you have two module_init for one
> > > OHCI module. Not sure how to fix this. Any idea?
> > 
> > A real problem is that the HCD core seems to have the assumption
> > built-in that there can only be one OHCI driver per machine/arch.
> > That's not the case for SSB, where we can have both PCI and SSB
> > bus enabled, so both ohci drivers compiled.
> > Any idea? Greg perhaps?
> 
> David has provided hints on how to do this in the past on the
> linux-usb-devel list if I remember correctly.

Is there any good reason why we can't split the OHCI drivers properly 
into separate modules?

> thanks,
> 
> greg k-h

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[David Brownell]

On Monday 05 March 2007 3:26 am, Michael Buesch wrote:

> > Actually, it seems like I will run into other kinds of nasty problems
> > due to stupid design of the HCD code. The OHCI code #includes
> > the various drivers, which have a module_init each. So if you
> > compile PCI and SSB support, you have two module_init for one
> > OHCI module. Not sure how to fix this. Any idea?
> 
> A real problem is that the HCD core seems to have the assumption
> built-in that there can only be one OHCI driver per machine/arch.

What ancient version of the driver are you referring to??

CURRENT code has one module_init, and can hook up to several
different kinds of bus glue.  There *is* only one OHCI driver.
It can hook up through several different kinds of bus glue; a
few platforms support more than one way to connect to various
implementations of OHCI.


> That's not the case for SSB, where we can have both PCI and SSB
> bus enabled, so both ohci drivers compiled.
> Any idea? Greg perhaps?

This already works in the current code ...

- Dave

Re: 2.6.21-rc2-mm1: drivers/usb/host/ohci-ssb.c doesn't compile

[Michael Buesch]

On Monday 05 March 2007 19:42, David Brownell wrote:
> On Monday 05 March 2007 3:26 am, Michael Buesch wrote:
> 
> > > Actually, it seems like I will run into other kinds of nasty problems
> > > due to stupid design of the HCD code. The OHCI code #includes
> > > the various drivers, which have a module_init each. So if you
> > > compile PCI and SSB support, you have two module_init for one
> > > OHCI module. Not sure how to fix this. Any idea?
> > 
> > A real problem is that the HCD core seems to have the assumption
> > built-in that there can only be one OHCI driver per machine/arch.
> 
> What ancient version of the driver are you referring to??

Uh, can't be _that_ ancient, as I wrote this stuff only a few weeks ago. :)

> CURRENT code has one module_init, and can hook up to several
> different kinds of bus glue.  There *is* only one OHCI driver.
> It can hook up through several different kinds of bus glue; a
> few platforms support more than one way to connect to various
> implementations of OHCI.

Yeah, good to see that this changed. I'll fixup the stuff. Thanks.

-- 
Greetings Michael.