[PATCH] fix drivers/staging/nvec linkage error when keyboard isdisabled

[Marc Dietrich]

Am Montag, 10. Oktober 2011, 22:20:11 schrieb Julian Andres Klode:
> On Mon, Oct 10, 2011 at 10:25:07AM -0700, Stephen Warren wrote:
> > Marc Dietrich wrote at Sunday, October 09, 2011 9:48 AM:
> > > Hi Mikael,
> > > 
> > > thanks for review. The nvec driver received some overhaul in the 3.1
> > > release cycle and he fruids can be viewed in linux-next tree. The nvec
> > > client drivers were converted to mfd children in the mean time. This
> > > solves the build error, but is not very flexible. We are planing to move
> > > the mfd stuct to the board file(s) in the next cycle.
> > 
> > Indeed, the code in v3.1-rc9 is quite different to that in linux-next, so
> > this exact problem doesn't exist in linux-next.
> > 
> > However, don't we still want to solve build problems for the final v3.1
> > release, or a stable update to that? As such,
> > 
> > Acked-by: Stephen Warren <swarren at nvidia.com>
> 
> Acked-by: Julian Andres Klode <jak at jak-linux.org>
> 
> But I should also add that there are probably more build failures due to
> dependencies, as there are no dependencies specified in Kconfig (so basically
> all nvec-* modules are subject to build failure if there dependencies
> are not enabled (INPUT/SERIO/whatever). There's a patch in -staging
> and -next for that, it may need adoption for 3.1 but would be needed
> to fix all build failures.

well, I consider these as minor problems. Up to now, we have no users of the driver 
and anyone who wants to build it should know what he does (e.g. patch a board file, 
choose the right config).

Having said that, I want to submit a patch in the next days which adds nvec support 
to the paz00 board file. If it's not to late for 3.2, I will also patch the nvec 
Makefile to fix possible build problems Julian mentioned. Otherwise it will be 3.3 
stuff.

Marc


> I do not have good internet currently and am busy, so I can't
> do anything to fix those problems, but I should have time
> and connection to review patches for 3.1 (perhaps adapted
> from the -staging one).
> 
> > > Am Samstag, 8. Oktober 2011, 19:29:14 schrieb Mikael Pettersson:
> > > > Building linux-3.1-rc9 for the Tegra ARM SoC with CONFIG_MFD_NVEC=y
> > > > and CONFIG_KEYBOARD_NVEC=n results in the following linkage error:
> > > > 
> > > > drivers/built-in.o: In function `tegra_nvec_probe':
> > > > /tmp/linux-3.1-rc9/drivers/staging/nvec/nvec.c:373: undefined reference
> > > > to
> > > > `nvec_kbd_init' make: *** [.tmp_vmlinux1] Error 1
> > > > 
> > > > Fixed by #ifdef:ing the call to nvec_kbd_init(), similar to the
> > > > existing #ifdef CONFIG_SERIO_NVEC_PS2 around the nvec_ps2() call.
> > > > 
> > > > Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
> > > > ---
> > > > 
> > > > --- linux-3.1-rc9/drivers/staging/nvec/nvec.c.~1~	2011-10-08
> > > > 16:28:20.000000000 +0200 +++
> > > > linux-3.1-rc9/drivers/staging/nvec/nvec.c	2011-10-08
> > > > 19:09:18.000000000 +0200 @@ -370,7 +370,9 @@ static int __devinit
> > > > tegra_nvec_probe(st
> > > > 
> > > >  	nvec_write_async(nvec, EC_ENABLE_EVENT_REPORTING,
> > > >  	
> > > >  				sizeof(EC_ENABLE_EVENT_REPORTING));
> > > > 
> > > > +#ifdef CONFIG_KEYBOARD_NVEC
> > > > 
> > > >  	nvec_kbd_init(novec);
> > > > 
> > > > +#endif
> > > > 
> > > >  #ifdef CONFIG_SERIO_NVEC_PS2
> > > >  
> > > >  	nvec_ps2(nvec);
> > > >  
> > > >  #endif
> 
> Live long and prosper!