diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2005-11-29 19:00:35 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 15:13:23 -0500 |
commit | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (patch) | |
tree | f89ab5a9197cf9bb771a556f8b48989416848dce /drivers | |
parent | 46654728b55bf5d09dc91fa45f532131d8a609f2 (diff) |
[PATCH] drivers/*rest*: Replace pci_module_init() with pci_register_driver()
Replace obsolete pci_module_init() with pci_register_driver().
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/vt8231.c | 2 | ||||
-rw-r--r-- | drivers/parport/parport_serial.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/vrc4173_cardu.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_txx9.c | 2 | ||||
-rw-r--r-- | drivers/video/cyblafb.c | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index d00a726d0239..3eb08f004c0f 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
@@ -841,7 +841,7 @@ static int __devinit vt8231_pci_probe(struct pci_dev *dev, | |||
841 | 841 | ||
842 | static int __init sm_vt8231_init(void) | 842 | static int __init sm_vt8231_init(void) |
843 | { | 843 | { |
844 | return pci_module_init(&vt8231_pci_driver); | 844 | return pci_register_driver(&vt8231_pci_driver); |
845 | } | 845 | } |
846 | 846 | ||
847 | static void __exit sm_vt8231_exit(void) | 847 | static void __exit sm_vt8231_exit(void) |
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index d3dad0aac7cb..76dd077e3184 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c | |||
@@ -464,7 +464,7 @@ static struct pci_driver parport_serial_pci_driver = { | |||
464 | 464 | ||
465 | static int __init parport_serial_init (void) | 465 | static int __init parport_serial_init (void) |
466 | { | 466 | { |
467 | return pci_module_init (&parport_serial_pci_driver); | 467 | return pci_register_driver (&parport_serial_pci_driver); |
468 | } | 468 | } |
469 | 469 | ||
470 | static void __exit parport_serial_exit (void) | 470 | static void __exit parport_serial_exit (void) |
diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c index 1b277d2c1c96..b502db2790e0 100644 --- a/drivers/pcmcia/vrc4173_cardu.c +++ b/drivers/pcmcia/vrc4173_cardu.c | |||
@@ -561,7 +561,7 @@ static int __devinit vrc4173_cardu_init(void) | |||
561 | { | 561 | { |
562 | vrc4173_cardu_slots = 0; | 562 | vrc4173_cardu_slots = 0; |
563 | 563 | ||
564 | return pci_module_init(&vrc4173_cardu_driver); | 564 | return pci_register_driver(&vrc4173_cardu_driver); |
565 | } | 565 | } |
566 | 566 | ||
567 | static void __devexit vrc4173_cardu_exit(void) | 567 | static void __devexit vrc4173_cardu_exit(void) |
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index f10c86d60b64..995d9dd9ddd5 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -1195,7 +1195,7 @@ static int __init serial_txx9_init(void) | |||
1195 | serial_txx9_register_ports(&serial_txx9_reg); | 1195 | serial_txx9_register_ports(&serial_txx9_reg); |
1196 | 1196 | ||
1197 | #ifdef ENABLE_SERIAL_TXX9_PCI | 1197 | #ifdef ENABLE_SERIAL_TXX9_PCI |
1198 | ret = pci_module_init(&serial_txx9_pci_driver); | 1198 | ret = pci_register_driver(&serial_txx9_pci_driver); |
1199 | #endif | 1199 | #endif |
1200 | } | 1200 | } |
1201 | return ret; | 1201 | return ret; |
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index e9f5dee67e3c..2b972461a030 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
@@ -1666,6 +1666,7 @@ static int __devinit cyblafb_init(void) | |||
1666 | #endif | 1666 | #endif |
1667 | output("CyblaFB version %s initializing\n", VERSION); | 1667 | output("CyblaFB version %s initializing\n", VERSION); |
1668 | return pci_module_init(&cyblafb_pci_driver); | 1668 | return pci_module_init(&cyblafb_pci_driver); |
1669 | return pci_register_driver(&cyblafb_pci_driver); | ||
1669 | } | 1670 | } |
1670 | 1671 | ||
1671 | static void __exit cyblafb_exit(void) | 1672 | static void __exit cyblafb_exit(void) |