aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/ata/acard-ahci.c13
-rw-r--r--drivers/ata/ahci.c14
-rw-r--r--drivers/ata/ata_generic.c15
-rw-r--r--drivers/ata/pata_acpi.c14
-rw-r--r--drivers/ata/pata_amd.c13
-rw-r--r--drivers/ata/pata_artop.c13
-rw-r--r--drivers/ata/pata_atiixp.c14
-rw-r--r--drivers/ata/pata_atp867x.c13
-rw-r--r--drivers/ata/pata_cmd640.c13
-rw-r--r--drivers/ata/pata_cmd64x.c13
-rw-r--r--drivers/ata/pata_cs5520.c14
-rw-r--r--drivers/ata/pata_cs5530.c13
-rw-r--r--drivers/ata/pata_cs5535.c13
-rw-r--r--drivers/ata/pata_cs5536.c13
-rw-r--r--drivers/ata/pata_cypress.c15
-rw-r--r--drivers/ata/pata_efar.c14
-rw-r--r--drivers/ata/pata_hpt366.c13
-rw-r--r--drivers/ata/pata_hpt37x.c13
-rw-r--r--drivers/ata/pata_hpt3x2n.c13
-rw-r--r--drivers/ata/pata_hpt3x3.c15
-rw-r--r--drivers/ata/pata_it8213.c13
-rw-r--r--drivers/ata/pata_it821x.c14
-rw-r--r--drivers/ata/pata_jmicron.c13
-rw-r--r--drivers/ata/pata_marvell.c14
-rw-r--r--drivers/ata/pata_mpiix.c13
-rw-r--r--drivers/ata/pata_netcell.c14
-rw-r--r--drivers/ata/pata_ninja32.c13
-rw-r--r--drivers/ata/pata_ns87410.c13
-rw-r--r--drivers/ata/pata_ns87415.c13
-rw-r--r--drivers/ata/pata_oldpiix.c14
-rw-r--r--drivers/ata/pata_opti.c14
-rw-r--r--drivers/ata/pata_optidma.c13
-rw-r--r--drivers/ata/pata_pdc2027x.c19
-rw-r--r--drivers/ata/pata_pdc202xx_old.c13
-rw-r--r--drivers/ata/pata_piccolo.c16
-rw-r--r--drivers/ata/pata_radisys.c14
-rw-r--r--drivers/ata/pata_rdc.c13
-rw-r--r--drivers/ata/pata_rz1000.c14
-rw-r--r--drivers/ata/pata_sc1200.c13
-rw-r--r--drivers/ata/pata_scc.c21
-rw-r--r--drivers/ata/pata_sch.c13
-rw-r--r--drivers/ata/pata_serverworks.c13
-rw-r--r--drivers/ata/pata_sil680.c13
-rw-r--r--drivers/ata/pata_sis.c14
-rw-r--r--drivers/ata/pata_sl82c105.c13
-rw-r--r--drivers/ata/pata_triflex.c13
-rw-r--r--drivers/ata/pata_via.c13
-rw-r--r--drivers/ata/pdc_adma.c13
-rw-r--r--drivers/ata/sata_inic162x.c13
-rw-r--r--drivers/ata/sata_nv.c13
-rw-r--r--drivers/ata/sata_promise.c13
-rw-r--r--drivers/ata/sata_qstor.c13
-rw-r--r--drivers/ata/sata_sil.c14
-rw-r--r--drivers/ata/sata_sil24.c13
-rw-r--r--drivers/ata/sata_sis.c13
-rw-r--r--drivers/ata/sata_svw.c13
-rw-r--r--drivers/ata/sata_sx4.c16
-rw-r--r--drivers/ata/sata_uli.c14
-rw-r--r--drivers/ata/sata_via.c13
-rw-r--r--drivers/ata/sata_vsc.c13
60 files changed, 60 insertions, 761 deletions
diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
index 3bc8c79bf2c7..4e94ba29cb8d 100644
--- a/drivers/ata/acard-ahci.c
+++ b/drivers/ata/acard-ahci.c
@@ -503,21 +503,10 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id
503 &acard_ahci_sht); 503 &acard_ahci_sht);
504} 504}
505 505
506static int __init acard_ahci_init(void) 506module_pci_driver(acard_ahci_pci_driver);
507{
508 return pci_register_driver(&acard_ahci_pci_driver);
509}
510
511static void __exit acard_ahci_exit(void)
512{
513 pci_unregister_driver(&acard_ahci_pci_driver);
514}
515 507
516MODULE_AUTHOR("Jeff Garzik"); 508MODULE_AUTHOR("Jeff Garzik");
517MODULE_DESCRIPTION("ACard AHCI SATA low-level driver"); 509MODULE_DESCRIPTION("ACard AHCI SATA low-level driver");
518MODULE_LICENSE("GPL"); 510MODULE_LICENSE("GPL");
519MODULE_DEVICE_TABLE(pci, acard_ahci_pci_tbl); 511MODULE_DEVICE_TABLE(pci, acard_ahci_pci_tbl);
520MODULE_VERSION(DRV_VERSION); 512MODULE_VERSION(DRV_VERSION);
521
522module_init(acard_ahci_init);
523module_exit(acard_ahci_exit);
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 20da1bcfebb9..4d9373e509cc 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1249,22 +1249,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1249 &ahci_sht); 1249 &ahci_sht);
1250} 1250}
1251 1251
1252static int __init ahci_init(void) 1252module_pci_driver(ahci_pci_driver);
1253{
1254 return pci_register_driver(&ahci_pci_driver);
1255}
1256
1257static void __exit ahci_exit(void)
1258{
1259 pci_unregister_driver(&ahci_pci_driver);
1260}
1261
1262 1253
1263MODULE_AUTHOR("Jeff Garzik"); 1254MODULE_AUTHOR("Jeff Garzik");
1264MODULE_DESCRIPTION("AHCI SATA low-level driver"); 1255MODULE_DESCRIPTION("AHCI SATA low-level driver");
1265MODULE_LICENSE("GPL"); 1256MODULE_LICENSE("GPL");
1266MODULE_DEVICE_TABLE(pci, ahci_pci_tbl); 1257MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);
1267MODULE_VERSION(DRV_VERSION); 1258MODULE_VERSION(DRV_VERSION);
1268
1269module_init(ahci_init);
1270module_exit(ahci_exit);
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index aae115600b74..f8f38a08abc5 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -255,17 +255,7 @@ static struct pci_driver ata_generic_pci_driver = {
255#endif 255#endif
256}; 256};
257 257
258static int __init ata_generic_init(void) 258module_pci_driver(ata_generic_pci_driver);
259{
260 return pci_register_driver(&ata_generic_pci_driver);
261}
262
263
264static void __exit ata_generic_exit(void)
265{
266 pci_unregister_driver(&ata_generic_pci_driver);
267}
268
269 259
270MODULE_AUTHOR("Alan Cox"); 260MODULE_AUTHOR("Alan Cox");
271MODULE_DESCRIPTION("low-level driver for generic ATA"); 261MODULE_DESCRIPTION("low-level driver for generic ATA");
@@ -273,7 +263,4 @@ MODULE_LICENSE("GPL");
273MODULE_DEVICE_TABLE(pci, ata_generic); 263MODULE_DEVICE_TABLE(pci, ata_generic);
274MODULE_VERSION(DRV_VERSION); 264MODULE_VERSION(DRV_VERSION);
275 265
276module_init(ata_generic_init);
277module_exit(ata_generic_exit);
278
279module_param(all_generic_ide, int, 0); 266module_param(all_generic_ide, int, 0);
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index b63ca3b54fb9..09723b76beac 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -273,22 +273,10 @@ static struct pci_driver pacpi_pci_driver = {
273#endif 273#endif
274}; 274};
275 275
276static int __init pacpi_init(void) 276module_pci_driver(pacpi_pci_driver);
277{
278 return pci_register_driver(&pacpi_pci_driver);
279}
280
281static void __exit pacpi_exit(void)
282{
283 pci_unregister_driver(&pacpi_pci_driver);
284}
285
286module_init(pacpi_init);
287module_exit(pacpi_exit);
288 277
289MODULE_AUTHOR("Alan Cox"); 278MODULE_AUTHOR("Alan Cox");
290MODULE_DESCRIPTION("SCSI low-level driver for ATA in ACPI mode"); 279MODULE_DESCRIPTION("SCSI low-level driver for ATA in ACPI mode");
291MODULE_LICENSE("GPL"); 280MODULE_LICENSE("GPL");
292MODULE_DEVICE_TABLE(pci, pacpi_pci_tbl); 281MODULE_DEVICE_TABLE(pci, pacpi_pci_tbl);
293MODULE_VERSION(DRV_VERSION); 282MODULE_VERSION(DRV_VERSION);
294
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index dc6b5dae0463..82a08922afcd 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -632,21 +632,10 @@ static struct pci_driver amd_pci_driver = {
632#endif 632#endif
633}; 633};
634 634
635static int __init amd_init(void) 635module_pci_driver(amd_pci_driver);
636{
637 return pci_register_driver(&amd_pci_driver);
638}
639
640static void __exit amd_exit(void)
641{
642 pci_unregister_driver(&amd_pci_driver);
643}
644 636
645MODULE_AUTHOR("Alan Cox"); 637MODULE_AUTHOR("Alan Cox");
646MODULE_DESCRIPTION("low-level driver for AMD and Nvidia PATA IDE"); 638MODULE_DESCRIPTION("low-level driver for AMD and Nvidia PATA IDE");
647MODULE_LICENSE("GPL"); 639MODULE_LICENSE("GPL");
648MODULE_DEVICE_TABLE(pci, amd); 640MODULE_DEVICE_TABLE(pci, amd);
649MODULE_VERSION(DRV_VERSION); 641MODULE_VERSION(DRV_VERSION);
650
651module_init(amd_init);
652module_exit(amd_exit);
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 4b8b22efc00b..74b215c09b21 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -451,18 +451,7 @@ static struct pci_driver artop_pci_driver = {
451#endif 451#endif
452}; 452};
453 453
454static int __init artop_init(void) 454module_pci_driver(artop_pci_driver);
455{
456 return pci_register_driver(&artop_pci_driver);
457}
458
459static void __exit artop_exit(void)
460{
461 pci_unregister_driver(&artop_pci_driver);
462}
463
464module_init(artop_init);
465module_exit(artop_exit);
466 455
467MODULE_AUTHOR("Alan Cox, Bartlomiej Zolnierkiewicz"); 456MODULE_AUTHOR("Alan Cox, Bartlomiej Zolnierkiewicz");
468MODULE_DESCRIPTION("SCSI low-level driver for ARTOP PATA"); 457MODULE_DESCRIPTION("SCSI low-level driver for ARTOP PATA");
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index be1aa1486d39..361c75cea57b 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -289,22 +289,10 @@ static struct pci_driver atiixp_pci_driver = {
289#endif 289#endif
290}; 290};
291 291
292static int __init atiixp_init(void) 292module_pci_driver(atiixp_pci_driver);
293{
294 return pci_register_driver(&atiixp_pci_driver);
295}
296
297
298static void __exit atiixp_exit(void)
299{
300 pci_unregister_driver(&atiixp_pci_driver);
301}
302 293
303MODULE_AUTHOR("Alan Cox"); 294MODULE_AUTHOR("Alan Cox");
304MODULE_DESCRIPTION("low-level driver for ATI IXP200/300/400"); 295MODULE_DESCRIPTION("low-level driver for ATI IXP200/300/400");
305MODULE_LICENSE("GPL"); 296MODULE_LICENSE("GPL");
306MODULE_DEVICE_TABLE(pci, atiixp); 297MODULE_DEVICE_TABLE(pci, atiixp);
307MODULE_VERSION(DRV_VERSION); 298MODULE_VERSION(DRV_VERSION);
308
309module_init(atiixp_init);
310module_exit(atiixp_exit);
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
index 3cfabb262af2..041f50d53240 100644
--- a/drivers/ata/pata_atp867x.c
+++ b/drivers/ata/pata_atp867x.c
@@ -565,21 +565,10 @@ static struct pci_driver atp867x_driver = {
565#endif 565#endif
566}; 566};
567 567
568static int __init atp867x_init(void) 568module_pci_driver(atp867x_driver);
569{
570 return pci_register_driver(&atp867x_driver);
571}
572
573static void __exit atp867x_exit(void)
574{
575 pci_unregister_driver(&atp867x_driver);
576}
577 569
578MODULE_AUTHOR("John(Jung-Ik) Lee, Google Inc."); 570MODULE_AUTHOR("John(Jung-Ik) Lee, Google Inc.");
579MODULE_DESCRIPTION("low level driver for Artop/Acard 867x ATA controller"); 571MODULE_DESCRIPTION("low level driver for Artop/Acard 867x ATA controller");
580MODULE_LICENSE("GPL"); 572MODULE_LICENSE("GPL");
581MODULE_DEVICE_TABLE(pci, atp867x_pci_tbl); 573MODULE_DEVICE_TABLE(pci, atp867x_pci_tbl);
582MODULE_VERSION(DRV_VERSION); 574MODULE_VERSION(DRV_VERSION);
583
584module_init(atp867x_init);
585module_exit(atp867x_exit);
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 549d28dbf90d..504b98b58e19 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -263,21 +263,10 @@ static struct pci_driver cmd640_pci_driver = {
263#endif 263#endif
264}; 264};
265 265
266static int __init cmd640_init(void) 266module_pci_driver(cmd640_pci_driver);
267{
268 return pci_register_driver(&cmd640_pci_driver);
269}
270
271static void __exit cmd640_exit(void)
272{
273 pci_unregister_driver(&cmd640_pci_driver);
274}
275 267
276MODULE_AUTHOR("Alan Cox"); 268MODULE_AUTHOR("Alan Cox");
277MODULE_DESCRIPTION("low-level driver for CMD640 PATA controllers"); 269MODULE_DESCRIPTION("low-level driver for CMD640 PATA controllers");
278MODULE_LICENSE("GPL"); 270MODULE_LICENSE("GPL");
279MODULE_DEVICE_TABLE(pci, cmd640); 271MODULE_DEVICE_TABLE(pci, cmd640);
280MODULE_VERSION(DRV_VERSION); 272MODULE_VERSION(DRV_VERSION);
281
282module_init(cmd640_init);
283module_exit(cmd640_exit);
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 1c17cd1e8b2d..8ec25af898de 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -525,21 +525,10 @@ static struct pci_driver cmd64x_pci_driver = {
525#endif 525#endif
526}; 526};
527 527
528static int __init cmd64x_init(void) 528module_pci_driver(cmd64x_pci_driver);
529{
530 return pci_register_driver(&cmd64x_pci_driver);
531}
532
533static void __exit cmd64x_exit(void)
534{
535 pci_unregister_driver(&cmd64x_pci_driver);
536}
537 529
538MODULE_AUTHOR("Alan Cox"); 530MODULE_AUTHOR("Alan Cox");
539MODULE_DESCRIPTION("low-level driver for CMD64x series PATA controllers"); 531MODULE_DESCRIPTION("low-level driver for CMD64x series PATA controllers");
540MODULE_LICENSE("GPL"); 532MODULE_LICENSE("GPL");
541MODULE_DEVICE_TABLE(pci, cmd64x); 533MODULE_DEVICE_TABLE(pci, cmd64x);
542MODULE_VERSION(DRV_VERSION); 534MODULE_VERSION(DRV_VERSION);
543
544module_init(cmd64x_init);
545module_exit(cmd64x_exit);
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 9ddcddc66a20..de74d804f031 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -302,22 +302,10 @@ static struct pci_driver cs5520_pci_driver = {
302#endif 302#endif
303}; 303};
304 304
305static int __init cs5520_init(void) 305module_pci_driver(cs5520_pci_driver);
306{
307 return pci_register_driver(&cs5520_pci_driver);
308}
309
310static void __exit cs5520_exit(void)
311{
312 pci_unregister_driver(&cs5520_pci_driver);
313}
314 306
315MODULE_AUTHOR("Alan Cox"); 307MODULE_AUTHOR("Alan Cox");
316MODULE_DESCRIPTION("low-level driver for Cyrix CS5510/5520"); 308MODULE_DESCRIPTION("low-level driver for Cyrix CS5510/5520");
317MODULE_LICENSE("GPL"); 309MODULE_LICENSE("GPL");
318MODULE_DEVICE_TABLE(pci, pata_cs5520); 310MODULE_DEVICE_TABLE(pci, pata_cs5520);
319MODULE_VERSION(DRV_VERSION); 311MODULE_VERSION(DRV_VERSION);
320
321module_init(cs5520_init);
322module_exit(cs5520_exit);
323
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index f792330f0d8e..48389ae0b330 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -363,21 +363,10 @@ static struct pci_driver cs5530_pci_driver = {
363#endif 363#endif
364}; 364};
365 365
366static int __init cs5530_init(void) 366module_pci_driver(cs5530_pci_driver);
367{
368 return pci_register_driver(&cs5530_pci_driver);
369}
370
371static void __exit cs5530_exit(void)
372{
373 pci_unregister_driver(&cs5530_pci_driver);
374}
375 367
376MODULE_AUTHOR("Alan Cox"); 368MODULE_AUTHOR("Alan Cox");
377MODULE_DESCRIPTION("low-level driver for the Cyrix/NS/AMD 5530"); 369MODULE_DESCRIPTION("low-level driver for the Cyrix/NS/AMD 5530");
378MODULE_LICENSE("GPL"); 370MODULE_LICENSE("GPL");
379MODULE_DEVICE_TABLE(pci, cs5530); 371MODULE_DEVICE_TABLE(pci, cs5530);
380MODULE_VERSION(DRV_VERSION); 372MODULE_VERSION(DRV_VERSION);
381
382module_init(cs5530_init);
383module_exit(cs5530_exit);
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index a0b4640125ae..997e16a3a63f 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -207,21 +207,10 @@ static struct pci_driver cs5535_pci_driver = {
207#endif 207#endif
208}; 208};
209 209
210static int __init cs5535_init(void) 210module_pci_driver(cs5535_pci_driver);
211{
212 return pci_register_driver(&cs5535_pci_driver);
213}
214
215static void __exit cs5535_exit(void)
216{
217 pci_unregister_driver(&cs5535_pci_driver);
218}
219 211
220MODULE_AUTHOR("Alan Cox, Jens Altmann, Wolfgan Zuleger, Alexander Kiausch"); 212MODULE_AUTHOR("Alan Cox, Jens Altmann, Wolfgan Zuleger, Alexander Kiausch");
221MODULE_DESCRIPTION("low-level driver for the NS/AMD 5535"); 213MODULE_DESCRIPTION("low-level driver for the NS/AMD 5535");
222MODULE_LICENSE("GPL"); 214MODULE_LICENSE("GPL");
223MODULE_DEVICE_TABLE(pci, cs5535); 215MODULE_DEVICE_TABLE(pci, cs5535);
224MODULE_VERSION(DRV_VERSION); 216MODULE_VERSION(DRV_VERSION);
225
226module_init(cs5535_init);
227module_exit(cs5535_exit);
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 7a402c75ab90..dec1b6c4b351 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -274,21 +274,10 @@ static struct pci_driver cs5536_pci_driver = {
274#endif 274#endif
275}; 275};
276 276
277static int __init cs5536_init(void) 277module_pci_driver(cs5536_pci_driver);
278{
279 return pci_register_driver(&cs5536_pci_driver);
280}
281
282static void __exit cs5536_exit(void)
283{
284 pci_unregister_driver(&cs5536_pci_driver);
285}
286 278
287MODULE_AUTHOR("Martin K. Petersen"); 279MODULE_AUTHOR("Martin K. Petersen");
288MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller"); 280MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller");
289MODULE_LICENSE("GPL"); 281MODULE_LICENSE("GPL");
290MODULE_DEVICE_TABLE(pci, cs5536); 282MODULE_DEVICE_TABLE(pci, cs5536);
291MODULE_VERSION(DRV_VERSION); 283MODULE_VERSION(DRV_VERSION);
292
293module_init(cs5536_init);
294module_exit(cs5536_exit);
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 6d915b063d93..810bc9964dde 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -158,23 +158,10 @@ static struct pci_driver cy82c693_pci_driver = {
158#endif 158#endif
159}; 159};
160 160
161static int __init cy82c693_init(void) 161module_pci_driver(cy82c693_pci_driver);
162{
163 return pci_register_driver(&cy82c693_pci_driver);
164}
165
166
167static void __exit cy82c693_exit(void)
168{
169 pci_unregister_driver(&cy82c693_pci_driver);
170}
171
172 162
173MODULE_AUTHOR("Alan Cox"); 163MODULE_AUTHOR("Alan Cox");
174MODULE_DESCRIPTION("low-level driver for the CY82C693 PATA controller"); 164MODULE_DESCRIPTION("low-level driver for the CY82C693 PATA controller");
175MODULE_LICENSE("GPL"); 165MODULE_LICENSE("GPL");
176MODULE_DEVICE_TABLE(pci, cy82c693); 166MODULE_DEVICE_TABLE(pci, cy82c693);
177MODULE_VERSION(DRV_VERSION); 167MODULE_VERSION(DRV_VERSION);
178
179module_init(cy82c693_init);
180module_exit(cy82c693_exit);
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index f0243ed206f7..3c12fd7acd41 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -295,22 +295,10 @@ static struct pci_driver efar_pci_driver = {
295#endif 295#endif
296}; 296};
297 297
298static int __init efar_init(void) 298module_pci_driver(efar_pci_driver);
299{
300 return pci_register_driver(&efar_pci_driver);
301}
302
303static void __exit efar_exit(void)
304{
305 pci_unregister_driver(&efar_pci_driver);
306}
307
308module_init(efar_init);
309module_exit(efar_exit);
310 299
311MODULE_AUTHOR("Alan Cox"); 300MODULE_AUTHOR("Alan Cox");
312MODULE_DESCRIPTION("SCSI low-level driver for EFAR PIIX clones"); 301MODULE_DESCRIPTION("SCSI low-level driver for EFAR PIIX clones");
313MODULE_LICENSE("GPL"); 302MODULE_LICENSE("GPL");
314MODULE_DEVICE_TABLE(pci, efar_pci_tbl); 303MODULE_DEVICE_TABLE(pci, efar_pci_tbl);
315MODULE_VERSION(DRV_VERSION); 304MODULE_VERSION(DRV_VERSION);
316
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 42cffd38910d..4be884a9f5ed 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -418,21 +418,10 @@ static struct pci_driver hpt36x_pci_driver = {
418#endif 418#endif
419}; 419};
420 420
421static int __init hpt36x_init(void) 421module_pci_driver(hpt36x_pci_driver);
422{
423 return pci_register_driver(&hpt36x_pci_driver);
424}
425
426static void __exit hpt36x_exit(void)
427{
428 pci_unregister_driver(&hpt36x_pci_driver);
429}
430 422
431MODULE_AUTHOR("Alan Cox"); 423MODULE_AUTHOR("Alan Cox");
432MODULE_DESCRIPTION("low-level driver for the Highpoint HPT366/368"); 424MODULE_DESCRIPTION("low-level driver for the Highpoint HPT366/368");
433MODULE_LICENSE("GPL"); 425MODULE_LICENSE("GPL");
434MODULE_DEVICE_TABLE(pci, hpt36x); 426MODULE_DEVICE_TABLE(pci, hpt36x);
435MODULE_VERSION(DRV_VERSION); 427MODULE_VERSION(DRV_VERSION);
436
437module_init(hpt36x_init);
438module_exit(hpt36x_exit);
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 9620636aa405..a9d74eff5fc4 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -1058,21 +1058,10 @@ static struct pci_driver hpt37x_pci_driver = {
1058 .remove = ata_pci_remove_one 1058 .remove = ata_pci_remove_one
1059}; 1059};
1060 1060
1061static int __init hpt37x_init(void) 1061module_pci_driver(hpt37x_pci_driver);
1062{
1063 return pci_register_driver(&hpt37x_pci_driver);
1064}
1065
1066static void __exit hpt37x_exit(void)
1067{
1068 pci_unregister_driver(&hpt37x_pci_driver);
1069}
1070 1062
1071MODULE_AUTHOR("Alan Cox"); 1063MODULE_AUTHOR("Alan Cox");
1072MODULE_DESCRIPTION("low-level driver for the Highpoint HPT37x/30x"); 1064MODULE_DESCRIPTION("low-level driver for the Highpoint HPT37x/30x");
1073MODULE_LICENSE("GPL"); 1065MODULE_LICENSE("GPL");
1074MODULE_DEVICE_TABLE(pci, hpt37x); 1066MODULE_DEVICE_TABLE(pci, hpt37x);
1075MODULE_VERSION(DRV_VERSION); 1067MODULE_VERSION(DRV_VERSION);
1076
1077module_init(hpt37x_init);
1078module_exit(hpt37x_exit);
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 765f136d8cd3..4be0398c153d 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -621,21 +621,10 @@ static struct pci_driver hpt3x2n_pci_driver = {
621 .remove = ata_pci_remove_one 621 .remove = ata_pci_remove_one
622}; 622};
623 623
624static int __init hpt3x2n_init(void) 624module_pci_driver(hpt3x2n_pci_driver);
625{
626 return pci_register_driver(&hpt3x2n_pci_driver);
627}
628
629static void __exit hpt3x2n_exit(void)
630{
631 pci_unregister_driver(&hpt3x2n_pci_driver);
632}
633 625
634MODULE_AUTHOR("Alan Cox"); 626MODULE_AUTHOR("Alan Cox");
635MODULE_DESCRIPTION("low-level driver for the Highpoint HPT3xxN"); 627MODULE_DESCRIPTION("low-level driver for the Highpoint HPT3xxN");
636MODULE_LICENSE("GPL"); 628MODULE_LICENSE("GPL");
637MODULE_DEVICE_TABLE(pci, hpt3x2n); 629MODULE_DEVICE_TABLE(pci, hpt3x2n);
638MODULE_VERSION(DRV_VERSION); 630MODULE_VERSION(DRV_VERSION);
639
640module_init(hpt3x2n_init);
641module_exit(hpt3x2n_exit);
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index b3042dab08bb..76c9314bb824 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -284,23 +284,10 @@ static struct pci_driver hpt3x3_pci_driver = {
284#endif 284#endif
285}; 285};
286 286
287static int __init hpt3x3_init(void) 287module_pci_driver(hpt3x3_pci_driver);
288{
289 return pci_register_driver(&hpt3x3_pci_driver);
290}
291
292
293static void __exit hpt3x3_exit(void)
294{
295 pci_unregister_driver(&hpt3x3_pci_driver);
296}
297
298 288
299MODULE_AUTHOR("Alan Cox"); 289MODULE_AUTHOR("Alan Cox");
300MODULE_DESCRIPTION("low-level driver for the Highpoint HPT343/363"); 290MODULE_DESCRIPTION("low-level driver for the Highpoint HPT343/363");
301MODULE_LICENSE("GPL"); 291MODULE_LICENSE("GPL");
302MODULE_DEVICE_TABLE(pci, hpt3x3); 292MODULE_DEVICE_TABLE(pci, hpt3x3);
303MODULE_VERSION(DRV_VERSION); 293MODULE_VERSION(DRV_VERSION);
304
305module_init(hpt3x3_init);
306module_exit(hpt3x3_exit);
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index cf9164d79f11..2a8dd9527ecc 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -290,18 +290,7 @@ static struct pci_driver it8213_pci_driver = {
290#endif 290#endif
291}; 291};
292 292
293static int __init it8213_init(void) 293module_pci_driver(it8213_pci_driver);
294{
295 return pci_register_driver(&it8213_pci_driver);
296}
297
298static void __exit it8213_exit(void)
299{
300 pci_unregister_driver(&it8213_pci_driver);
301}
302
303module_init(it8213_init);
304module_exit(it8213_exit);
305 294
306MODULE_AUTHOR("Alan Cox"); 295MODULE_AUTHOR("Alan Cox");
307MODULE_DESCRIPTION("SCSI low-level driver for the ITE 8213"); 296MODULE_DESCRIPTION("SCSI low-level driver for the ITE 8213");
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 62c5d00abd2e..9cc05d808ad5 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -972,15 +972,7 @@ static struct pci_driver it821x_pci_driver = {
972#endif 972#endif
973}; 973};
974 974
975static int __init it821x_init(void) 975module_pci_driver(it821x_pci_driver);
976{
977 return pci_register_driver(&it821x_pci_driver);
978}
979
980static void __exit it821x_exit(void)
981{
982 pci_unregister_driver(&it821x_pci_driver);
983}
984 976
985MODULE_AUTHOR("Alan Cox"); 977MODULE_AUTHOR("Alan Cox");
986MODULE_DESCRIPTION("low-level driver for the IT8211/IT8212 IDE RAID controller"); 978MODULE_DESCRIPTION("low-level driver for the IT8211/IT8212 IDE RAID controller");
@@ -988,9 +980,5 @@ MODULE_LICENSE("GPL");
988MODULE_DEVICE_TABLE(pci, it821x); 980MODULE_DEVICE_TABLE(pci, it821x);
989MODULE_VERSION(DRV_VERSION); 981MODULE_VERSION(DRV_VERSION);
990 982
991
992module_param_named(noraid, it8212_noraid, int, S_IRUGO); 983module_param_named(noraid, it8212_noraid, int, S_IRUGO);
993MODULE_PARM_DESC(noraid, "Force card into bypass mode"); 984MODULE_PARM_DESC(noraid, "Force card into bypass mode");
994
995module_init(it821x_init);
996module_exit(it821x_exit);
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index cb3babbb7035..76e739b031b6 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -164,18 +164,7 @@ static struct pci_driver jmicron_pci_driver = {
164#endif 164#endif
165}; 165};
166 166
167static int __init jmicron_init(void) 167module_pci_driver(jmicron_pci_driver);
168{
169 return pci_register_driver(&jmicron_pci_driver);
170}
171
172static void __exit jmicron_exit(void)
173{
174 pci_unregister_driver(&jmicron_pci_driver);
175}
176
177module_init(jmicron_init);
178module_exit(jmicron_exit);
179 168
180MODULE_AUTHOR("Alan Cox"); 169MODULE_AUTHOR("Alan Cox");
181MODULE_DESCRIPTION("SCSI low-level driver for Jmicron PATA ports"); 170MODULE_DESCRIPTION("SCSI low-level driver for Jmicron PATA ports");
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 5d7f58a7e34d..a4f5e781c8c2 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -178,22 +178,10 @@ static struct pci_driver marvell_pci_driver = {
178#endif 178#endif
179}; 179};
180 180
181static int __init marvell_init(void) 181module_pci_driver(marvell_pci_driver);
182{
183 return pci_register_driver(&marvell_pci_driver);
184}
185
186static void __exit marvell_exit(void)
187{
188 pci_unregister_driver(&marvell_pci_driver);
189}
190
191module_init(marvell_init);
192module_exit(marvell_exit);
193 182
194MODULE_AUTHOR("Alan Cox"); 183MODULE_AUTHOR("Alan Cox");
195MODULE_DESCRIPTION("SCSI low-level driver for Marvell ATA in legacy mode"); 184MODULE_DESCRIPTION("SCSI low-level driver for Marvell ATA in legacy mode");
196MODULE_LICENSE("GPL"); 185MODULE_LICENSE("GPL");
197MODULE_DEVICE_TABLE(pci, marvell_pci_tbl); 186MODULE_DEVICE_TABLE(pci, marvell_pci_tbl);
198MODULE_VERSION(DRV_VERSION); 187MODULE_VERSION(DRV_VERSION);
199
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 9dc16df84191..1f5f28bb0bb8 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -230,21 +230,10 @@ static struct pci_driver mpiix_pci_driver = {
230#endif 230#endif
231}; 231};
232 232
233static int __init mpiix_init(void) 233module_pci_driver(mpiix_pci_driver);
234{
235 return pci_register_driver(&mpiix_pci_driver);
236}
237
238static void __exit mpiix_exit(void)
239{
240 pci_unregister_driver(&mpiix_pci_driver);
241}
242 234
243MODULE_AUTHOR("Alan Cox"); 235MODULE_AUTHOR("Alan Cox");
244MODULE_DESCRIPTION("low-level driver for Intel MPIIX"); 236MODULE_DESCRIPTION("low-level driver for Intel MPIIX");
245MODULE_LICENSE("GPL"); 237MODULE_LICENSE("GPL");
246MODULE_DEVICE_TABLE(pci, mpiix); 238MODULE_DEVICE_TABLE(pci, mpiix);
247MODULE_VERSION(DRV_VERSION); 239MODULE_VERSION(DRV_VERSION);
248
249module_init(mpiix_init);
250module_exit(mpiix_exit);
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 9979a43bc596..ad1a0febd620 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -99,22 +99,10 @@ static struct pci_driver netcell_pci_driver = {
99#endif 99#endif
100}; 100};
101 101
102static int __init netcell_init(void) 102module_pci_driver(netcell_pci_driver);
103{
104 return pci_register_driver(&netcell_pci_driver);
105}
106
107static void __exit netcell_exit(void)
108{
109 pci_unregister_driver(&netcell_pci_driver);
110}
111
112module_init(netcell_init);
113module_exit(netcell_exit);
114 103
115MODULE_AUTHOR("Alan Cox"); 104MODULE_AUTHOR("Alan Cox");
116MODULE_DESCRIPTION("SCSI low-level driver for Netcell PATA RAID"); 105MODULE_DESCRIPTION("SCSI low-level driver for Netcell PATA RAID");
117MODULE_LICENSE("GPL"); 106MODULE_LICENSE("GPL");
118MODULE_DEVICE_TABLE(pci, netcell_pci_tbl); 107MODULE_DEVICE_TABLE(pci, netcell_pci_tbl);
119MODULE_VERSION(DRV_VERSION); 108MODULE_VERSION(DRV_VERSION);
120
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index e277a142138c..12010ed596c4 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -190,21 +190,10 @@ static struct pci_driver ninja32_pci_driver = {
190#endif 190#endif
191}; 191};
192 192
193static int __init ninja32_init(void) 193module_pci_driver(ninja32_pci_driver);
194{
195 return pci_register_driver(&ninja32_pci_driver);
196}
197
198static void __exit ninja32_exit(void)
199{
200 pci_unregister_driver(&ninja32_pci_driver);
201}
202 194
203MODULE_AUTHOR("Alan Cox"); 195MODULE_AUTHOR("Alan Cox");
204MODULE_DESCRIPTION("low-level driver for Ninja32 ATA"); 196MODULE_DESCRIPTION("low-level driver for Ninja32 ATA");
205MODULE_LICENSE("GPL"); 197MODULE_LICENSE("GPL");
206MODULE_DEVICE_TABLE(pci, ninja32); 198MODULE_DEVICE_TABLE(pci, ninja32);
207MODULE_VERSION(DRV_VERSION); 199MODULE_VERSION(DRV_VERSION);
208
209module_init(ninja32_init);
210module_exit(ninja32_exit);
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 31d5986537a3..0c424dae56e7 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -168,21 +168,10 @@ static struct pci_driver ns87410_pci_driver = {
168#endif 168#endif
169}; 169};
170 170
171static int __init ns87410_init(void) 171module_pci_driver(ns87410_pci_driver);
172{
173 return pci_register_driver(&ns87410_pci_driver);
174}
175
176static void __exit ns87410_exit(void)
177{
178 pci_unregister_driver(&ns87410_pci_driver);
179}
180 172
181MODULE_AUTHOR("Alan Cox"); 173MODULE_AUTHOR("Alan Cox");
182MODULE_DESCRIPTION("low-level driver for Nat Semi 87410"); 174MODULE_DESCRIPTION("low-level driver for Nat Semi 87410");
183MODULE_LICENSE("GPL"); 175MODULE_LICENSE("GPL");
184MODULE_DEVICE_TABLE(pci, ns87410); 176MODULE_DEVICE_TABLE(pci, ns87410);
185MODULE_VERSION(DRV_VERSION); 177MODULE_VERSION(DRV_VERSION);
186
187module_init(ns87410_init);
188module_exit(ns87410_exit);
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index f1d517bc5b49..6f6fa1060505 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -414,18 +414,7 @@ static struct pci_driver ns87415_pci_driver = {
414#endif 414#endif
415}; 415};
416 416
417static int __init ns87415_init(void) 417module_pci_driver(ns87415_pci_driver);
418{
419 return pci_register_driver(&ns87415_pci_driver);
420}
421
422static void __exit ns87415_exit(void)
423{
424 pci_unregister_driver(&ns87415_pci_driver);
425}
426
427module_init(ns87415_init);
428module_exit(ns87415_exit);
429 418
430MODULE_AUTHOR("Alan Cox"); 419MODULE_AUTHOR("Alan Cox");
431MODULE_DESCRIPTION("ATA low-level driver for NS87415 controllers"); 420MODULE_DESCRIPTION("ATA low-level driver for NS87415 controllers");
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 98cdf50e4065..d77b2e1054ef 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -265,22 +265,10 @@ static struct pci_driver oldpiix_pci_driver = {
265#endif 265#endif
266}; 266};
267 267
268static int __init oldpiix_init(void) 268module_pci_driver(oldpiix_pci_driver);
269{
270 return pci_register_driver(&oldpiix_pci_driver);
271}
272
273static void __exit oldpiix_exit(void)
274{
275 pci_unregister_driver(&oldpiix_pci_driver);
276}
277
278module_init(oldpiix_init);
279module_exit(oldpiix_exit);
280 269
281MODULE_AUTHOR("Alan Cox"); 270MODULE_AUTHOR("Alan Cox");
282MODULE_DESCRIPTION("SCSI low-level driver for early PIIX series controllers"); 271MODULE_DESCRIPTION("SCSI low-level driver for early PIIX series controllers");
283MODULE_LICENSE("GPL"); 272MODULE_LICENSE("GPL");
284MODULE_DEVICE_TABLE(pci, oldpiix_pci_tbl); 273MODULE_DEVICE_TABLE(pci, oldpiix_pci_tbl);
285MODULE_VERSION(DRV_VERSION); 274MODULE_VERSION(DRV_VERSION);
286
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index accc033faf77..4ea70cd22aee 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -191,22 +191,10 @@ static struct pci_driver opti_pci_driver = {
191#endif 191#endif
192}; 192};
193 193
194static int __init opti_init(void) 194module_pci_driver(opti_pci_driver);
195{
196 return pci_register_driver(&opti_pci_driver);
197}
198
199static void __exit opti_exit(void)
200{
201 pci_unregister_driver(&opti_pci_driver);
202}
203
204 195
205MODULE_AUTHOR("Alan Cox"); 196MODULE_AUTHOR("Alan Cox");
206MODULE_DESCRIPTION("low-level driver for Opti 621/621X"); 197MODULE_DESCRIPTION("low-level driver for Opti 621/621X");
207MODULE_LICENSE("GPL"); 198MODULE_LICENSE("GPL");
208MODULE_DEVICE_TABLE(pci, opti); 199MODULE_DEVICE_TABLE(pci, opti);
209MODULE_VERSION(DRV_VERSION); 200MODULE_VERSION(DRV_VERSION);
210
211module_init(opti_init);
212module_exit(opti_exit);
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 77cb91408632..78ede3fd1875 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -447,21 +447,10 @@ static struct pci_driver optidma_pci_driver = {
447#endif 447#endif
448}; 448};
449 449
450static int __init optidma_init(void) 450module_pci_driver(optidma_pci_driver);
451{
452 return pci_register_driver(&optidma_pci_driver);
453}
454
455static void __exit optidma_exit(void)
456{
457 pci_unregister_driver(&optidma_pci_driver);
458}
459 451
460MODULE_AUTHOR("Alan Cox"); 452MODULE_AUTHOR("Alan Cox");
461MODULE_DESCRIPTION("low-level driver for Opti Firestar/Firestar Plus"); 453MODULE_DESCRIPTION("low-level driver for Opti Firestar/Firestar Plus");
462MODULE_LICENSE("GPL"); 454MODULE_LICENSE("GPL");
463MODULE_DEVICE_TABLE(pci, optidma); 455MODULE_DEVICE_TABLE(pci, optidma);
464MODULE_VERSION(DRV_VERSION); 456MODULE_VERSION(DRV_VERSION);
465
466module_init(optidma_init);
467module_exit(optidma_exit);
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 7d63f24179c7..c9399c8688c5 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -784,21 +784,4 @@ static int pdc2027x_reinit_one(struct pci_dev *pdev)
784} 784}
785#endif 785#endif
786 786
787/** 787module_pci_driver(pdc2027x_pci_driver);
788 * pdc2027x_init - Called after this module is loaded into the kernel.
789 */
790static int __init pdc2027x_init(void)
791{
792 return pci_register_driver(&pdc2027x_pci_driver);
793}
794
795/**
796 * pdc2027x_exit - Called before this module unloaded from the kernel
797 */
798static void __exit pdc2027x_exit(void)
799{
800 pci_unregister_driver(&pdc2027x_pci_driver);
801}
802
803module_init(pdc2027x_init);
804module_exit(pdc2027x_exit);
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index c2ed5868dda6..c34fc50070a6 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -384,21 +384,10 @@ static struct pci_driver pdc202xx_pci_driver = {
384#endif 384#endif
385}; 385};
386 386
387static int __init pdc202xx_init(void) 387module_pci_driver(pdc202xx_pci_driver);
388{
389 return pci_register_driver(&pdc202xx_pci_driver);
390}
391
392static void __exit pdc202xx_exit(void)
393{
394 pci_unregister_driver(&pdc202xx_pci_driver);
395}
396 388
397MODULE_AUTHOR("Alan Cox"); 389MODULE_AUTHOR("Alan Cox");
398MODULE_DESCRIPTION("low-level driver for Promise 2024x and 20262-20267"); 390MODULE_DESCRIPTION("low-level driver for Promise 2024x and 20262-20267");
399MODULE_LICENSE("GPL"); 391MODULE_LICENSE("GPL");
400MODULE_DEVICE_TABLE(pci, pdc202xx); 392MODULE_DEVICE_TABLE(pci, pdc202xx);
401MODULE_VERSION(DRV_VERSION); 393MODULE_VERSION(DRV_VERSION);
402
403module_init(pdc202xx_init);
404module_exit(pdc202xx_exit);
diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c
index cb01bf9496fe..2beb6b5045f8 100644
--- a/drivers/ata/pata_piccolo.c
+++ b/drivers/ata/pata_piccolo.c
@@ -117,24 +117,10 @@ static struct pci_driver ata_tosh_pci_driver = {
117#endif 117#endif
118}; 118};
119 119
120static int __init ata_tosh_init(void) 120module_pci_driver(ata_tosh_pci_driver);
121{
122 return pci_register_driver(&ata_tosh_pci_driver);
123}
124
125
126static void __exit ata_tosh_exit(void)
127{
128 pci_unregister_driver(&ata_tosh_pci_driver);
129}
130
131 121
132MODULE_AUTHOR("Alan Cox"); 122MODULE_AUTHOR("Alan Cox");
133MODULE_DESCRIPTION("Low level driver for Toshiba Piccolo ATA"); 123MODULE_DESCRIPTION("Low level driver for Toshiba Piccolo ATA");
134MODULE_LICENSE("GPL"); 124MODULE_LICENSE("GPL");
135MODULE_DEVICE_TABLE(pci, ata_tosh); 125MODULE_DEVICE_TABLE(pci, ata_tosh);
136MODULE_VERSION(DRV_VERSION); 126MODULE_VERSION(DRV_VERSION);
137
138module_init(ata_tosh_init);
139module_exit(ata_tosh_exit);
140
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index b2d3a2bb4e60..f582ba180a7d 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -244,22 +244,10 @@ static struct pci_driver radisys_pci_driver = {
244#endif 244#endif
245}; 245};
246 246
247static int __init radisys_init(void) 247module_pci_driver(radisys_pci_driver);
248{
249 return pci_register_driver(&radisys_pci_driver);
250}
251
252static void __exit radisys_exit(void)
253{
254 pci_unregister_driver(&radisys_pci_driver);
255}
256
257module_init(radisys_init);
258module_exit(radisys_exit);
259 248
260MODULE_AUTHOR("Alan Cox"); 249MODULE_AUTHOR("Alan Cox");
261MODULE_DESCRIPTION("SCSI low-level driver for Radisys R82600 controllers"); 250MODULE_DESCRIPTION("SCSI low-level driver for Radisys R82600 controllers");
262MODULE_LICENSE("GPL"); 251MODULE_LICENSE("GPL");
263MODULE_DEVICE_TABLE(pci, radisys_pci_tbl); 252MODULE_DEVICE_TABLE(pci, radisys_pci_tbl);
264MODULE_VERSION(DRV_VERSION); 253MODULE_VERSION(DRV_VERSION);
265
diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
index e6a2dd7809c1..32a3499e83e7 100644
--- a/drivers/ata/pata_rdc.c
+++ b/drivers/ata/pata_rdc.c
@@ -394,18 +394,7 @@ static struct pci_driver rdc_pci_driver = {
394}; 394};
395 395
396 396
397static int __init rdc_init(void) 397module_pci_driver(rdc_pci_driver);
398{
399 return pci_register_driver(&rdc_pci_driver);
400}
401
402static void __exit rdc_exit(void)
403{
404 pci_unregister_driver(&rdc_pci_driver);
405}
406
407module_init(rdc_init);
408module_exit(rdc_exit);
409 398
410MODULE_AUTHOR("Alan Cox (based on ata_piix)"); 399MODULE_AUTHOR("Alan Cox (based on ata_piix)");
411MODULE_DESCRIPTION("SCSI low-level driver for RDC PATA controllers"); 400MODULE_DESCRIPTION("SCSI low-level driver for RDC PATA controllers");
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index aca321e1e6a2..60f4de2dd47d 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -140,22 +140,10 @@ static struct pci_driver rz1000_pci_driver = {
140#endif 140#endif
141}; 141};
142 142
143static int __init rz1000_init(void) 143module_pci_driver(rz1000_pci_driver);
144{
145 return pci_register_driver(&rz1000_pci_driver);
146}
147
148static void __exit rz1000_exit(void)
149{
150 pci_unregister_driver(&rz1000_pci_driver);
151}
152 144
153MODULE_AUTHOR("Alan Cox"); 145MODULE_AUTHOR("Alan Cox");
154MODULE_DESCRIPTION("low-level driver for RZ1000 PCI ATA"); 146MODULE_DESCRIPTION("low-level driver for RZ1000 PCI ATA");
155MODULE_LICENSE("GPL"); 147MODULE_LICENSE("GPL");
156MODULE_DEVICE_TABLE(pci, pata_rz1000); 148MODULE_DEVICE_TABLE(pci, pata_rz1000);
157MODULE_VERSION(DRV_VERSION); 149MODULE_VERSION(DRV_VERSION);
158
159module_init(rz1000_init);
160module_exit(rz1000_exit);
161
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index c0e603a84f7f..ce2f828c17b3 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -261,21 +261,10 @@ static struct pci_driver sc1200_pci_driver = {
261#endif 261#endif
262}; 262};
263 263
264static int __init sc1200_init(void) 264module_pci_driver(sc1200_pci_driver);
265{
266 return pci_register_driver(&sc1200_pci_driver);
267}
268
269static void __exit sc1200_exit(void)
270{
271 pci_unregister_driver(&sc1200_pci_driver);
272}
273 265
274MODULE_AUTHOR("Alan Cox, Mark Lord"); 266MODULE_AUTHOR("Alan Cox, Mark Lord");
275MODULE_DESCRIPTION("low-level driver for the NS/AMD SC1200"); 267MODULE_DESCRIPTION("low-level driver for the NS/AMD SC1200");
276MODULE_LICENSE("GPL"); 268MODULE_LICENSE("GPL");
277MODULE_DEVICE_TABLE(pci, sc1200); 269MODULE_DEVICE_TABLE(pci, sc1200);
278MODULE_VERSION(DRV_VERSION); 270MODULE_VERSION(DRV_VERSION);
279
280module_init(sc1200_init);
281module_exit(sc1200_exit);
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index e265f835c95d..f35f15f4d83e 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -1103,26 +1103,7 @@ static struct pci_driver scc_pci_driver = {
1103#endif 1103#endif
1104}; 1104};
1105 1105
1106static int __init scc_init (void) 1106module_pci_driver(scc_pci_driver);
1107{
1108 int rc;
1109
1110 DPRINTK("pci_register_driver\n");
1111 rc = pci_register_driver(&scc_pci_driver);
1112 if (rc)
1113 return rc;
1114
1115 DPRINTK("done\n");
1116 return 0;
1117}
1118
1119static void __exit scc_exit (void)
1120{
1121 pci_unregister_driver(&scc_pci_driver);
1122}
1123
1124module_init(scc_init);
1125module_exit(scc_exit);
1126 1107
1127MODULE_AUTHOR("Toshiba corp"); 1108MODULE_AUTHOR("Toshiba corp");
1128MODULE_DESCRIPTION("SCSI low-level driver for Toshiba SCC PATA controller"); 1109MODULE_DESCRIPTION("SCSI low-level driver for Toshiba SCC PATA controller");
diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index 7c78b9993627..db0d18cf1c2a 100644
--- a/drivers/ata/pata_sch.c
+++ b/drivers/ata/pata_sch.c
@@ -179,15 +179,4 @@ static int __devinit sch_init_one(struct pci_dev *pdev,
179 return ata_pci_bmdma_init_one(pdev, ppi, &sch_sht, NULL, 0); 179 return ata_pci_bmdma_init_one(pdev, ppi, &sch_sht, NULL, 0);
180} 180}
181 181
182static int __init sch_init(void) 182module_pci_driver(sch_pci_driver);
183{
184 return pci_register_driver(&sch_pci_driver);
185}
186
187static void __exit sch_exit(void)
188{
189 pci_unregister_driver(&sch_pci_driver);
190}
191
192module_init(sch_init);
193module_exit(sch_exit);
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 71eaf385e970..f3febbce6c46 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -475,21 +475,10 @@ static struct pci_driver serverworks_pci_driver = {
475#endif 475#endif
476}; 476};
477 477
478static int __init serverworks_init(void) 478module_pci_driver(serverworks_pci_driver);
479{
480 return pci_register_driver(&serverworks_pci_driver);
481}
482
483static void __exit serverworks_exit(void)
484{
485 pci_unregister_driver(&serverworks_pci_driver);
486}
487 479
488MODULE_AUTHOR("Alan Cox"); 480MODULE_AUTHOR("Alan Cox");
489MODULE_DESCRIPTION("low-level driver for Serverworks OSB4/CSB5/CSB6"); 481MODULE_DESCRIPTION("low-level driver for Serverworks OSB4/CSB5/CSB6");
490MODULE_LICENSE("GPL"); 482MODULE_LICENSE("GPL");
491MODULE_DEVICE_TABLE(pci, serverworks); 483MODULE_DEVICE_TABLE(pci, serverworks);
492MODULE_VERSION(DRV_VERSION); 484MODULE_VERSION(DRV_VERSION);
493
494module_init(serverworks_init);
495module_exit(serverworks_exit);
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index b92eacf8dd3c..5cfdf94823d0 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -437,21 +437,10 @@ static struct pci_driver sil680_pci_driver = {
437#endif 437#endif
438}; 438};
439 439
440static int __init sil680_init(void) 440module_pci_driver(sil680_pci_driver);
441{
442 return pci_register_driver(&sil680_pci_driver);
443}
444
445static void __exit sil680_exit(void)
446{
447 pci_unregister_driver(&sil680_pci_driver);
448}
449 441
450MODULE_AUTHOR("Alan Cox"); 442MODULE_AUTHOR("Alan Cox");
451MODULE_DESCRIPTION("low-level driver for SI680 PATA"); 443MODULE_DESCRIPTION("low-level driver for SI680 PATA");
452MODULE_LICENSE("GPL"); 444MODULE_LICENSE("GPL");
453MODULE_DEVICE_TABLE(pci, sil680); 445MODULE_DEVICE_TABLE(pci, sil680);
454MODULE_VERSION(DRV_VERSION); 446MODULE_VERSION(DRV_VERSION);
455
456module_init(sil680_init);
457module_exit(sil680_exit);
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index b0edc7de7b2d..2d5ac1361262 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -906,22 +906,10 @@ static struct pci_driver sis_pci_driver = {
906#endif 906#endif
907}; 907};
908 908
909static int __init sis_init(void) 909module_pci_driver(sis_pci_driver);
910{
911 return pci_register_driver(&sis_pci_driver);
912}
913
914static void __exit sis_exit(void)
915{
916 pci_unregister_driver(&sis_pci_driver);
917}
918
919module_init(sis_init);
920module_exit(sis_exit);
921 910
922MODULE_AUTHOR("Alan Cox"); 911MODULE_AUTHOR("Alan Cox");
923MODULE_DESCRIPTION("SCSI low-level driver for SiS ATA"); 912MODULE_DESCRIPTION("SCSI low-level driver for SiS ATA");
924MODULE_LICENSE("GPL"); 913MODULE_LICENSE("GPL");
925MODULE_DEVICE_TABLE(pci, sis_pci_tbl); 914MODULE_DEVICE_TABLE(pci, sis_pci_tbl);
926MODULE_VERSION(DRV_VERSION); 915MODULE_VERSION(DRV_VERSION);
927
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 24cf200dd1c9..738e000107d6 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -372,21 +372,10 @@ static struct pci_driver sl82c105_pci_driver = {
372#endif 372#endif
373}; 373};
374 374
375static int __init sl82c105_init(void) 375module_pci_driver(sl82c105_pci_driver);
376{
377 return pci_register_driver(&sl82c105_pci_driver);
378}
379
380static void __exit sl82c105_exit(void)
381{
382 pci_unregister_driver(&sl82c105_pci_driver);
383}
384 376
385MODULE_AUTHOR("Alan Cox"); 377MODULE_AUTHOR("Alan Cox");
386MODULE_DESCRIPTION("low-level driver for Sl82c105"); 378MODULE_DESCRIPTION("low-level driver for Sl82c105");
387MODULE_LICENSE("GPL"); 379MODULE_LICENSE("GPL");
388MODULE_DEVICE_TABLE(pci, sl82c105); 380MODULE_DEVICE_TABLE(pci, sl82c105);
389MODULE_VERSION(DRV_VERSION); 381MODULE_VERSION(DRV_VERSION);
390
391module_init(sl82c105_init);
392module_exit(sl82c105_exit);
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 28da1c6becf1..c8e589d91231 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -240,21 +240,10 @@ static struct pci_driver triflex_pci_driver = {
240#endif 240#endif
241}; 241};
242 242
243static int __init triflex_init(void) 243module_pci_driver(triflex_pci_driver);
244{
245 return pci_register_driver(&triflex_pci_driver);
246}
247
248static void __exit triflex_exit(void)
249{
250 pci_unregister_driver(&triflex_pci_driver);
251}
252 244
253MODULE_AUTHOR("Alan Cox"); 245MODULE_AUTHOR("Alan Cox");
254MODULE_DESCRIPTION("low-level driver for Compaq Triflex"); 246MODULE_DESCRIPTION("low-level driver for Compaq Triflex");
255MODULE_LICENSE("GPL"); 247MODULE_LICENSE("GPL");
256MODULE_DEVICE_TABLE(pci, triflex); 248MODULE_DEVICE_TABLE(pci, triflex);
257MODULE_VERSION(DRV_VERSION); 249MODULE_VERSION(DRV_VERSION);
258
259module_init(triflex_init);
260module_exit(triflex_exit);
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 255f336cd7ea..8d2a9fdf6b8d 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -711,21 +711,10 @@ static struct pci_driver via_pci_driver = {
711#endif 711#endif
712}; 712};
713 713
714static int __init via_init(void) 714module_pci_driver(via_pci_driver);
715{
716 return pci_register_driver(&via_pci_driver);
717}
718
719static void __exit via_exit(void)
720{
721 pci_unregister_driver(&via_pci_driver);
722}
723 715
724MODULE_AUTHOR("Alan Cox"); 716MODULE_AUTHOR("Alan Cox");
725MODULE_DESCRIPTION("low-level driver for VIA PATA"); 717MODULE_DESCRIPTION("low-level driver for VIA PATA");
726MODULE_LICENSE("GPL"); 718MODULE_LICENSE("GPL");
727MODULE_DEVICE_TABLE(pci, via); 719MODULE_DEVICE_TABLE(pci, via);
728MODULE_VERSION(DRV_VERSION); 720MODULE_VERSION(DRV_VERSION);
729
730module_init(via_init);
731module_exit(via_exit);
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 04911d52f59d..505333340ad5 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -660,21 +660,10 @@ static int adma_ata_init_one(struct pci_dev *pdev,
660 &adma_ata_sht); 660 &adma_ata_sht);
661} 661}
662 662
663static int __init adma_ata_init(void) 663module_pci_driver(adma_ata_pci_driver);
664{
665 return pci_register_driver(&adma_ata_pci_driver);
666}
667
668static void __exit adma_ata_exit(void)
669{
670 pci_unregister_driver(&adma_ata_pci_driver);
671}
672 664
673MODULE_AUTHOR("Mark Lord"); 665MODULE_AUTHOR("Mark Lord");
674MODULE_DESCRIPTION("Pacific Digital Corporation ADMA low-level driver"); 666MODULE_DESCRIPTION("Pacific Digital Corporation ADMA low-level driver");
675MODULE_LICENSE("GPL"); 667MODULE_LICENSE("GPL");
676MODULE_DEVICE_TABLE(pci, adma_ata_pci_tbl); 668MODULE_DEVICE_TABLE(pci, adma_ata_pci_tbl);
677MODULE_VERSION(DRV_VERSION); 669MODULE_VERSION(DRV_VERSION);
678
679module_init(adma_ata_init);
680module_exit(adma_ata_exit);
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 5c7d70c03bf0..dc35f4d42b8b 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -894,21 +894,10 @@ static struct pci_driver inic_pci_driver = {
894 .remove = ata_pci_remove_one, 894 .remove = ata_pci_remove_one,
895}; 895};
896 896
897static int __init inic_init(void) 897module_pci_driver(inic_pci_driver);
898{
899 return pci_register_driver(&inic_pci_driver);
900}
901
902static void __exit inic_exit(void)
903{
904 pci_unregister_driver(&inic_pci_driver);
905}
906 898
907MODULE_AUTHOR("Tejun Heo"); 899MODULE_AUTHOR("Tejun Heo");
908MODULE_DESCRIPTION("low-level driver for Initio 162x SATA"); 900MODULE_DESCRIPTION("low-level driver for Initio 162x SATA");
909MODULE_LICENSE("GPL v2"); 901MODULE_LICENSE("GPL v2");
910MODULE_DEVICE_TABLE(pci, inic_pci_tbl); 902MODULE_DEVICE_TABLE(pci, inic_pci_tbl);
911MODULE_VERSION(DRV_VERSION); 903MODULE_VERSION(DRV_VERSION);
912
913module_init(inic_init);
914module_exit(inic_exit);
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 55d6179dde58..85ee4993ca74 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -2510,22 +2510,11 @@ static void nv_adma_host_stop(struct ata_host *host)
2510 nv_ck804_host_stop(host); 2510 nv_ck804_host_stop(host);
2511} 2511}
2512 2512
2513static int __init nv_init(void) 2513module_pci_driver(nv_pci_driver);
2514{
2515 return pci_register_driver(&nv_pci_driver);
2516}
2517
2518static void __exit nv_exit(void)
2519{
2520 pci_unregister_driver(&nv_pci_driver);
2521}
2522 2514
2523module_init(nv_init);
2524module_exit(nv_exit);
2525module_param_named(adma, adma_enabled, bool, 0444); 2515module_param_named(adma, adma_enabled, bool, 0444);
2526MODULE_PARM_DESC(adma, "Enable use of ADMA (Default: false)"); 2516MODULE_PARM_DESC(adma, "Enable use of ADMA (Default: false)");
2527module_param_named(swncq, swncq_enabled, bool, 0444); 2517module_param_named(swncq, swncq_enabled, bool, 0444);
2528MODULE_PARM_DESC(swncq, "Enable use of SWNCQ (Default: true)"); 2518MODULE_PARM_DESC(swncq, "Enable use of SWNCQ (Default: true)");
2529module_param_named(msi, msi_enabled, bool, 0444); 2519module_param_named(msi, msi_enabled, bool, 0444);
2530MODULE_PARM_DESC(msi, "Enable use of MSI (Default: false)"); 2520MODULE_PARM_DESC(msi, "Enable use of MSI (Default: false)");
2531
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 000fcc99e01d..489c81768321 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -1249,21 +1249,10 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
1249 &pdc_ata_sht); 1249 &pdc_ata_sht);
1250} 1250}
1251 1251
1252static int __init pdc_ata_init(void) 1252module_pci_driver(pdc_ata_pci_driver);
1253{
1254 return pci_register_driver(&pdc_ata_pci_driver);
1255}
1256
1257static void __exit pdc_ata_exit(void)
1258{
1259 pci_unregister_driver(&pdc_ata_pci_driver);
1260}
1261 1253
1262MODULE_AUTHOR("Jeff Garzik"); 1254MODULE_AUTHOR("Jeff Garzik");
1263MODULE_DESCRIPTION("Promise ATA TX2/TX4/TX4000 low-level driver"); 1255MODULE_DESCRIPTION("Promise ATA TX2/TX4/TX4000 low-level driver");
1264MODULE_LICENSE("GPL"); 1256MODULE_LICENSE("GPL");
1265MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl); 1257MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl);
1266MODULE_VERSION(DRV_VERSION); 1258MODULE_VERSION(DRV_VERSION);
1267
1268module_init(pdc_ata_init);
1269module_exit(pdc_ata_exit);
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 9d1a47bb21b3..3b0dd57984e1 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -635,21 +635,10 @@ static int qs_ata_init_one(struct pci_dev *pdev,
635 &qs_ata_sht); 635 &qs_ata_sht);
636} 636}
637 637
638static int __init qs_ata_init(void) 638module_pci_driver(qs_ata_pci_driver);
639{
640 return pci_register_driver(&qs_ata_pci_driver);
641}
642
643static void __exit qs_ata_exit(void)
644{
645 pci_unregister_driver(&qs_ata_pci_driver);
646}
647 639
648MODULE_AUTHOR("Mark Lord"); 640MODULE_AUTHOR("Mark Lord");
649MODULE_DESCRIPTION("Pacific Digital Corporation QStor SATA low-level driver"); 641MODULE_DESCRIPTION("Pacific Digital Corporation QStor SATA low-level driver");
650MODULE_LICENSE("GPL"); 642MODULE_LICENSE("GPL");
651MODULE_DEVICE_TABLE(pci, qs_ata_pci_tbl); 643MODULE_DEVICE_TABLE(pci, qs_ata_pci_tbl);
652MODULE_VERSION(DRV_VERSION); 644MODULE_VERSION(DRV_VERSION);
653
654module_init(qs_ata_init);
655module_exit(qs_ata_exit);
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 9dfb40b8c2c9..a7b31672c4b7 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -819,16 +819,4 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
819} 819}
820#endif 820#endif
821 821
822static int __init sil_init(void) 822module_pci_driver(sil_pci_driver);
823{
824 return pci_register_driver(&sil_pci_driver);
825}
826
827static void __exit sil_exit(void)
828{
829 pci_unregister_driver(&sil_pci_driver);
830}
831
832
833module_init(sil_init);
834module_exit(sil_exit);
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index e7e610aa9a7a..a5f2a563a26a 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1382,20 +1382,9 @@ static int sil24_port_resume(struct ata_port *ap)
1382} 1382}
1383#endif 1383#endif
1384 1384
1385static int __init sil24_init(void) 1385module_pci_driver(sil24_pci_driver);
1386{
1387 return pci_register_driver(&sil24_pci_driver);
1388}
1389
1390static void __exit sil24_exit(void)
1391{
1392 pci_unregister_driver(&sil24_pci_driver);
1393}
1394 1386
1395MODULE_AUTHOR("Tejun Heo"); 1387MODULE_AUTHOR("Tejun Heo");
1396MODULE_DESCRIPTION("Silicon Image 3124/3132 SATA low-level driver"); 1388MODULE_DESCRIPTION("Silicon Image 3124/3132 SATA low-level driver");
1397MODULE_LICENSE("GPL"); 1389MODULE_LICENSE("GPL");
1398MODULE_DEVICE_TABLE(pci, sil24_pci_tbl); 1390MODULE_DEVICE_TABLE(pci, sil24_pci_tbl);
1399
1400module_init(sil24_init);
1401module_exit(sil24_exit);
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 95ec435f0eb4..fe3ca0989b14 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -308,15 +308,4 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
308 IRQF_SHARED, &sis_sht); 308 IRQF_SHARED, &sis_sht);
309} 309}
310 310
311static int __init sis_init(void) 311module_pci_driver(sis_pci_driver);
312{
313 return pci_register_driver(&sis_pci_driver);
314}
315
316static void __exit sis_exit(void)
317{
318 pci_unregister_driver(&sis_pci_driver);
319}
320
321module_init(sis_init);
322module_exit(sis_exit);
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index c646118943ff..44a4256533e1 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -525,21 +525,10 @@ static struct pci_driver k2_sata_pci_driver = {
525 .remove = ata_pci_remove_one, 525 .remove = ata_pci_remove_one,
526}; 526};
527 527
528static int __init k2_sata_init(void) 528module_pci_driver(k2_sata_pci_driver);
529{
530 return pci_register_driver(&k2_sata_pci_driver);
531}
532
533static void __exit k2_sata_exit(void)
534{
535 pci_unregister_driver(&k2_sata_pci_driver);
536}
537 529
538MODULE_AUTHOR("Benjamin Herrenschmidt"); 530MODULE_AUTHOR("Benjamin Herrenschmidt");
539MODULE_DESCRIPTION("low-level driver for K2 SATA controller"); 531MODULE_DESCRIPTION("low-level driver for K2 SATA controller");
540MODULE_LICENSE("GPL"); 532MODULE_LICENSE("GPL");
541MODULE_DEVICE_TABLE(pci, k2_sata_pci_tbl); 533MODULE_DEVICE_TABLE(pci, k2_sata_pci_tbl);
542MODULE_VERSION(DRV_VERSION); 534MODULE_VERSION(DRV_VERSION);
543
544module_init(k2_sata_init);
545module_exit(k2_sata_exit);
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index cdaebbe3d184..122605593166 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -1498,24 +1498,10 @@ static int pdc_sata_init_one(struct pci_dev *pdev,
1498 IRQF_SHARED, &pdc_sata_sht); 1498 IRQF_SHARED, &pdc_sata_sht);
1499} 1499}
1500 1500
1501 1501module_pci_driver(pdc_sata_pci_driver);
1502static int __init pdc_sata_init(void)
1503{
1504 return pci_register_driver(&pdc_sata_pci_driver);
1505}
1506
1507
1508static void __exit pdc_sata_exit(void)
1509{
1510 pci_unregister_driver(&pdc_sata_pci_driver);
1511}
1512
1513 1502
1514MODULE_AUTHOR("Jeff Garzik"); 1503MODULE_AUTHOR("Jeff Garzik");
1515MODULE_DESCRIPTION("Promise SATA low-level driver"); 1504MODULE_DESCRIPTION("Promise SATA low-level driver");
1516MODULE_LICENSE("GPL"); 1505MODULE_LICENSE("GPL");
1517MODULE_DEVICE_TABLE(pci, pdc_sata_pci_tbl); 1506MODULE_DEVICE_TABLE(pci, pdc_sata_pci_tbl);
1518MODULE_VERSION(DRV_VERSION); 1507MODULE_VERSION(DRV_VERSION);
1519
1520module_init(pdc_sata_init);
1521module_exit(pdc_sata_exit);
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index b54ebfcdda32..6d6489118873 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -243,16 +243,4 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
243 IRQF_SHARED, &uli_sht); 243 IRQF_SHARED, &uli_sht);
244} 244}
245 245
246static int __init uli_init(void) 246module_pci_driver(uli_pci_driver);
247{
248 return pci_register_driver(&uli_pci_driver);
249}
250
251static void __exit uli_exit(void)
252{
253 pci_unregister_driver(&uli_pci_driver);
254}
255
256
257module_init(uli_init);
258module_exit(uli_exit);
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index f93e43b0ccd8..5913ea9d57b2 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -655,15 +655,4 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
655 IRQF_SHARED, &svia_sht); 655 IRQF_SHARED, &svia_sht);
656} 656}
657 657
658static int __init svia_init(void) 658module_pci_driver(svia_pci_driver);
659{
660 return pci_register_driver(&svia_pci_driver);
661}
662
663static void __exit svia_exit(void)
664{
665 pci_unregister_driver(&svia_pci_driver);
666}
667
668module_init(svia_init);
669module_exit(svia_exit);
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 6135a5288695..e8cf88ba145d 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -436,21 +436,10 @@ static struct pci_driver vsc_sata_pci_driver = {
436 .remove = ata_pci_remove_one, 436 .remove = ata_pci_remove_one,
437}; 437};
438 438
439static int __init vsc_sata_init(void) 439module_pci_driver(vsc_sata_pci_driver);
440{
441 return pci_register_driver(&vsc_sata_pci_driver);
442}
443
444static void __exit vsc_sata_exit(void)
445{
446 pci_unregister_driver(&vsc_sata_pci_driver);
447}
448 440
449MODULE_AUTHOR("Jeremy Higdon"); 441MODULE_AUTHOR("Jeremy Higdon");
450MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller"); 442MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller");
451MODULE_LICENSE("GPL"); 443MODULE_LICENSE("GPL");
452MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl); 444MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl);
453MODULE_VERSION(DRV_VERSION); 445MODULE_VERSION(DRV_VERSION);
454
455module_init(vsc_sata_init);
456module_exit(vsc_sata_exit);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 16:57:14 -0500