Patchwork fix drivers/staging/nvec linkage error when keyboard is disabled

login
register
mail settings
Submitter Mikael Pettersson
Date Oct. 8, 2011, 5:29 p.m.
Message ID <20112.34922.209107.730268@pilspetsen.it.uu.se>
Download mbox | patch
Permalink /patch/119269/
State New, archived
Headers show

Comments

Mikael Pettersson - Oct. 8, 2011, 5:29 p.m.
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@it.uu.se>
---

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg KH - Oct. 17, 2011, 10:20 p.m.
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@nvidia.com>
> 
> I also CC'd the staging maintainer Greg KH and Tegra maintainers Olof and
> Colin on this email.

I'm confused, what patch should I apply here?  Can someone please resend
it in a format that I can apply it in?  With the proper acks?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg KH - Oct. 17, 2011, 10:20 p.m.
On Mon, Oct 17, 2011 at 03:20:19PM -0700, Greg KH wrote:
> 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@nvidia.com>
> > 
> > I also CC'd the staging maintainer Greg KH and Tegra maintainers Olof and
> > Colin on this email.
> 
> I'm confused, what patch should I apply here?  Can someone please resend
> it in a format that I can apply it in?  With the proper acks?

Nevermind, it already was, sorry for the noise...

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- 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(nvec);
+#endif
 #ifdef CONFIG_SERIO_NVEC_PS2
 	nvec_ps2(nvec);
 #endif