From 7fced565e55be83a18a3b7bb64995515c61edd53 Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Thu, 7 Mar 2013 13:25:53 +0100 Subject: softingcs: initialize spinlock with macro Signed-off-by: Kurt Van Dijck Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/softing/softing_cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/net/can/softing/softing_cs.c') diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index c2c0a5bb0b21..77620543cd91 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c @@ -27,7 +27,7 @@ #include "softing_platform.h" static int softingcs_index; -static spinlock_t softingcs_index_lock; +static DEFINE_SPINLOCK(softingcs_index_lock); static int softingcs_reset(struct platform_device *pdev, int v); static int softingcs_enable_irq(struct platform_device *pdev, int v); @@ -342,7 +342,6 @@ static struct pcmcia_driver softingcs_driver = { static int __init softingcs_start(void) { - spin_lock_init(&softingcs_index_lock); return pcmcia_register_driver(&softingcs_driver); } -- cgit v1.2.3 From a750fa4edd9e5d840a1ada4a272601c82e56a83a Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Thu, 7 Mar 2013 13:28:18 +0100 Subject: softingcs: use module_pcmcia_driver Signed-off-by: Kurt Van Dijck Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/softing/softing_cs.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'drivers/net/can/softing/softing_cs.c') diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index 77620543cd91..738355c12744 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c @@ -340,18 +340,7 @@ static struct pcmcia_driver softingcs_driver = { .remove = softingcs_remove, }; -static int __init softingcs_start(void) -{ - return pcmcia_register_driver(&softingcs_driver); -} - -static void __exit softingcs_stop(void) -{ - pcmcia_unregister_driver(&softingcs_driver); -} - -module_init(softingcs_start); -module_exit(softingcs_stop); +module_pcmcia_driver(&softingcs_driver); MODULE_DESCRIPTION("softing CANcard driver" ", links PCMCIA card to softing driver"); -- cgit v1.2.3 From 501ad1c49b3d8c7b7495ef044c698c22710fc27d Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Mon, 18 Mar 2013 09:58:03 +0100 Subject: FIX: softingcs conversion to module_pcmcia_driver macro Reported-by: Stephen Rothwell Signed-off-by: Kurt Van Dijck Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/softing/softing_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/can/softing/softing_cs.c') diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index 738355c12744..498605f833dd 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"); -- cgit v1.2.3