Re: linux-next: build failure after merge of the char-misc tree

[Kurt Van Dijck]

On Mon, Mar 18, 2013 at 01:56:14PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
> drivers/net/can/softing/softing_cs.c: In function '__inittest':
> drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function)
> drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/can/softing/softing_cs.c: At top level:
> drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token
> drivers/net/can/softing/softing_cs.c: In function '__exittest':
> drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function)
> drivers/net/can/softing/softing_cs.c: At top level:
> drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable]
> drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol '&softingcs_driver_init'
> drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol '&softingcs_driver_exit'
> 
> Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver").
> 
> I have used the char-misc tree form next-20130315 for today.

I have no idea what I've overlooked during tests.  My apologies.
I have found the problem. Can this be squashed?
Kurt

-- 
commit 081ec8f7f7ef4d68c7a6ffe4a571b1a855527627
Author: Kurt Van Dijck <kurt.van.dijck@xxxxxx>
Date:   Mon Mar 18 09:56:55 2013

    FIX: softingcs conversion to module_pcmcia_driver macro
    
    Signed-off-by: Kurt Van Dijck <kurt.van.dijck@xxxxxx>

diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index 738355c..498605f 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -340,7 +340,7 @@ static struct pcmcia_driver softingcs_driver = {
 	.remove		= softingcs_remove,
 };
 
-module_pcmcia_driver(&softingcs_driver);
+module_pcmcia_driver(softingcs_driver);
 
 MODULE_DESCRIPTION("softing CANcard driver"
 		", links PCMCIA card to softing driver");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/