aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-06 13:26:50 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-15 15:26:04 -0400
commit0aae9c6a913483b69b5cb703329cbf1ed3efbfcb (patch)
tree94a769f3932c391e6f316827b9a53da27fcbd332
parente0c005f4b9fe8bb2bceb5ce9f69eaa61383f41db (diff)
drivers/isdn: use module_pcmcia_driver() in pcmcia drivers
Use the new module_pcmcia_driver() macro to remove the boilerplate module init/exit code in the pcmcia drivers. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c14
-rw-r--r--drivers/isdn/hisax/avma1_cs.c14
-rw-r--r--drivers/isdn/hisax/elsa_cs.c14
-rw-r--r--drivers/isdn/hisax/sedlbauer_cs.c14
-rw-r--r--drivers/isdn/hisax/teles_cs.c14
5 files changed, 5 insertions, 65 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index c21353d8e915..62b8030ee331 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -163,16 +163,4 @@ static struct pcmcia_driver avmcs_driver = {
163 .remove = avmcs_detach, 163 .remove = avmcs_detach,
164 .id_table = avmcs_ids, 164 .id_table = avmcs_ids,
165}; 165};
166 166module_pcmcia_driver(avmcs_driver);
167static int __init avmcs_init(void)
168{
169 return pcmcia_register_driver(&avmcs_driver);
170}
171
172static void __exit avmcs_exit(void)
173{
174 pcmcia_unregister_driver(&avmcs_driver);
175}
176
177module_init(avmcs_init);
178module_exit(avmcs_exit);
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 4e676bcf8506..baad94ec1f4a 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -159,16 +159,4 @@ static struct pcmcia_driver avma1cs_driver = {
159 .remove = avma1cs_detach, 159 .remove = avma1cs_detach,
160 .id_table = avma1cs_ids, 160 .id_table = avma1cs_ids,
161}; 161};
162 162module_pcmcia_driver(avma1cs_driver);
163static int __init init_avma1_cs(void)
164{
165 return pcmcia_register_driver(&avma1cs_driver);
166}
167
168static void __exit exit_avma1_cs(void)
169{
170 pcmcia_unregister_driver(&avma1cs_driver);
171}
172
173module_init(init_avma1_cs);
174module_exit(exit_avma1_cs);
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index ebe56918f6fc..40f6fad79de3 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -215,16 +215,4 @@ static struct pcmcia_driver elsa_cs_driver = {
215 .suspend = elsa_suspend, 215 .suspend = elsa_suspend,
216 .resume = elsa_resume, 216 .resume = elsa_resume,
217}; 217};
218 218module_pcmcia_driver(elsa_cs_driver);
219static int __init init_elsa_cs(void)
220{
221 return pcmcia_register_driver(&elsa_cs_driver);
222}
223
224static void __exit exit_elsa_cs(void)
225{
226 pcmcia_unregister_driver(&elsa_cs_driver);
227}
228
229module_init(init_elsa_cs);
230module_exit(exit_elsa_cs);
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 90f81291641b..92ef62d4caf4 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -206,16 +206,4 @@ static struct pcmcia_driver sedlbauer_driver = {
206 .suspend = sedlbauer_suspend, 206 .suspend = sedlbauer_suspend,
207 .resume = sedlbauer_resume, 207 .resume = sedlbauer_resume,
208}; 208};
209 209module_pcmcia_driver(sedlbauer_driver);
210static int __init init_sedlbauer_cs(void)
211{
212 return pcmcia_register_driver(&sedlbauer_driver);
213}
214
215static void __exit exit_sedlbauer_cs(void)
216{
217 pcmcia_unregister_driver(&sedlbauer_driver);
218}
219
220module_init(init_sedlbauer_cs);
221module_exit(exit_sedlbauer_cs);
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index f2476ffb04fd..b8dd14958757 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -197,16 +197,4 @@ static struct pcmcia_driver teles_cs_driver = {
197 .suspend = teles_suspend, 197 .suspend = teles_suspend,
198 .resume = teles_resume, 198 .resume = teles_resume,
199}; 199};
200 200module_pcmcia_driver(teles_cs_driver);
201static int __init init_teles_cs(void)
202{
203 return pcmcia_register_driver(&teles_cs_driver);
204}
205
206static void __exit exit_teles_cs(void)
207{
208 pcmcia_unregister_driver(&teles_cs_driver);
209}
210
211module_init(init_teles_cs);
212module_exit(exit_teles_cs);