Skip to contentSkip to conversation

OSS: replace all uses of pci_module_init with pci_register_driver

PATCH In review Otavio Salvador 4 participants 18 messages Dec 3, 2005 – Dec 4, 2005

Subsystems (28)
Network drivers Media (V4L/DVB) SCSI Sound +24 more subsystems
lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

PATCH 1/11 OSS: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 sound/oss/ad1889.c         |    2 +-
 sound/oss/btaudio.c        |    2 +-
 sound/oss/cmpci.c          |    2 +-
 sound/oss/cs4281/cs4281m.c |    2 +-
 sound/oss/cs46xx.c         |    2 +-
 sound/oss/emu10k1/main.c   |    2 +-
 sound/oss/es1370.c         |    2 +-
 sound/oss/es1371.c         |    4 ++--
 sound/oss/ite8172.c        |    2 +-
 sound/oss/kahlua.c         |    2 +-
 sound/oss/maestro.c        |    2 +-
 sound/oss/nec_vrc5477.c    |    2 +-
 sound/oss/nm256_audio.c    |    2 +-
 sound/oss/rme96xx.c        |    2 +-
 sound/oss/sonicvibes.c     |    2 +-
 sound/oss/ymfpci.c         |    2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

applies-to: 06378a021f5873003a07f0388aa0cb6e81a32c19 d9850fb29c5e82534c4c6a93b18cb56bcbc28025

sound/oss/ad1889.c +1 -1
index 2cfd214..a0d73f3 100644
@@ -1089,7 +1089,7 @@ static struct pci_driver ad1889_driver =
 
 static int __init ad1889_init_module(void)
 {
-	return pci_module_init(&ad1889_driver);
+	return pci_register_driver(&ad1889_driver);
 }
 
 static void ad1889_exit_module(void)
sound/oss/btaudio.c +1 -1
index a85093f..4007a56 100644
@@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
 	       digital ? "digital" : "",
 	       analog && digital ? "+" : "",
 	       analog ? "analog" : "");
-	return pci_module_init(&btaudio_pci_driver);
+	return pci_register_driver(&btaudio_pci_driver);
 }
 
 static void btaudio_cleanup_module(void)
sound/oss/cmpci.c +1 -1
index 74dcca7..7cfbb08 100644
@@ -3366,7 +3366,7 @@ static struct pci_driver cm_driver = {
 static int __init init_cmpci(void)
 {
 	printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n");
-	return pci_module_init(&cm_driver);
+	return pci_register_driver(&cm_driver);
 }
 
 static void __exit cleanup_cmpci(void)
sound/oss/cs4281/cs4281m.c +1 -1
index adc6896..872f0f4 100644
@@ -4477,7 +4477,7 @@ static int __init cs4281_init_module(voi
 	printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
 	       __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
 	       CS4281_ARCH);
-	rtn = pci_module_init(&cs4281_pci_driver);
+	rtn = pci_register_driver(&cs4281_pci_driver);
 
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
 		  printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
sound/oss/cs46xx.c +1 -1
index cb998e8..b36a52d 100644
@@ -5711,7 +5711,7 @@ static int __init cs46xx_init_module(voi
 	int rtn = 0;
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
 		"cs46xx: cs46xx_init_module()+ \n"));
-	rtn = pci_module_init(&cs46xx_pci_driver);
+	rtn = pci_register_driver(&cs46xx_pci_driver);
 
 	if(rtn == -ENODEV)
 	{
sound/oss/emu10k1/main.c +1 -1
index 9b905ba..23241cb 100644
@@ -1428,7 +1428,7 @@ static int __init emu10k1_init_module(vo
 {
 	printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n");
 
-	return pci_module_init(&emu10k1_pci_driver);
+	return pci_register_driver(&emu10k1_pci_driver);
 }
 
 static void __exit emu10k1_cleanup_module(void)
sound/oss/es1370.c +1 -1
index 8538085..ae55c53 100644
@@ -2779,7 +2779,7 @@ static struct pci_driver es1370_driver =
 static int __init init_es1370(void)
 {
 	printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n");
-	return pci_module_init(&es1370_driver);
+	return pci_register_driver(&es1370_driver);
 }
 
 static void __exit cleanup_es1370(void)
sound/oss/es1371.c +2 -2
index 12a56d5..f770df8 100644
@@ -94,7 +94,7 @@
  *    07.02.2000   0.24  Use pci_alloc_consistent and pci_register_driver
  *    07.02.2000   0.25  Use ac97_codec
  *    01.03.2000   0.26  SPDIF patch by Mikael Bouillot <[email protected]>
- *                       Use pci_module_init
+ *                       Use pci_register_driver
  *    21.11.2000   0.27  Initialize dma buffers in poll, otherwise poll may return a bogus mask
  *    12.12.2000   0.28  More dma buffer initializations, patch from
  *                       Tjeerd Mulder <[email protected]>

@@ -3090,7 +3090,7 @@ static struct pci_driver es1371_driver =
 static int __init init_es1371(void)
 {
 	printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
-	return pci_module_init(&es1371_driver);
+	return pci_register_driver(&es1371_driver);
 }
 
 static void __exit cleanup_es1371(void)
sound/oss/ite8172.c +1 -1
index 26e5944..8fd2f9a 100644
@@ -2206,7 +2206,7 @@ static struct pci_driver it8172_driver =
 static int __init init_it8172(void)
 {
 	info("version v0.5 time " __TIME__ " " __DATE__);
-	return pci_module_init(&it8172_driver);
+	return pci_register_driver(&it8172_driver);
 }
 
 static void __exit cleanup_it8172(void)
sound/oss/kahlua.c +1 -1
index 808c5ef..2835a7c 100644
@@ -218,7 +218,7 @@ static struct pci_driver kahlua_driver =
 static int __init kahlua_init_module(void)
 {
 	printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
-	return pci_module_init(&kahlua_driver);
+	return pci_register_driver(&kahlua_driver);
 }
 
 static void __devexit kahlua_cleanup_module(void)
sound/oss/maestro.c +1 -1
index 3abd354..af63ebe 100644
@@ -3634,7 +3634,7 @@ static int __init init_maestro(void)
 {
 	int rc;
 
-	rc = pci_module_init(&maestro_pci_driver);
+	rc = pci_register_driver(&maestro_pci_driver);
 	if (rc < 0)
 		return rc;
sound/oss/nec_vrc5477.c +1 -1
index 9ac4bf7..fbb9170 100644
@@ -2045,7 +2045,7 @@ static struct pci_driver vrc5477_ac97_dr
 static int __init init_vrc5477_ac97(void)
 {
 	printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
-	return pci_module_init(&vrc5477_ac97_driver);
+	return pci_register_driver(&vrc5477_ac97_driver);
 }
 
 static void __exit cleanup_vrc5477_ac97(void)
sound/oss/nm256_audio.c +1 -1
index 0ce2c40..dcb1d1f 100644
@@ -1690,7 +1690,7 @@ module_param(force_load, bool, 0);
 static int __init do_init_nm256(void)
 {
     printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
-    return pci_module_init(&nm256_pci_driver);
+    return pci_register_driver(&nm256_pci_driver);
 }
 
 static void __exit cleanup_nm256 (void)
sound/oss/rme96xx.c +1 -1
index 318dc51..faa0b79 100644
@@ -1095,7 +1095,7 @@ static int __init init_rme96xx(void)
 	devices = ((devices-1) & RME96xx_MASK_DEVS) + 1;
 	printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices);
         numcards = 0;
-	return pci_module_init(&rme96xx_driver);
+	return pci_register_driver(&rme96xx_driver);
 }
 
 static void __exit cleanup_rme96xx(void)
sound/oss/sonicvibes.c +1 -1
index 17d0e46..71b05e2 100644
@@ -2765,7 +2765,7 @@ static int __init init_sonicvibes(void)
 	if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT)))
 		printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n");
 #endif
-	return pci_module_init(&sv_driver);
+	return pci_register_driver(&sv_driver);
 }
 
 static void __exit cleanup_sonicvibes(void)
sound/oss/ymfpci.c +1 -1
index 8dae59b..f8bd72e 100644
@@ -2680,7 +2680,7 @@ static struct pci_driver ymfpci_driver =
 
 static int __init ymf_init_module(void)
 {
-	return pci_module_init(&ymfpci_driver);
+	return pci_register_driver(&ymfpci_driver);
 }
 
 static void __exit ymf_cleanup_module (void)

---
0.99.9k

author
#1 lore raw

PATCH 2/11 SCSI: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/scsi/3w-9xxx.c                 |    2 +-
 drivers/scsi/3w-xxxx.c                 |    2 +-
 drivers/scsi/a100u2w.c                 |    2 +-
 drivers/scsi/ahci.c                    |    2 +-
 drivers/scsi/aic7xxx/aic79xx_osm_pci.c |    2 +-
 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c |    2 +-
 drivers/scsi/ata_piix.c                |    4 ++--
 drivers/scsi/dc395x.c                  |    2 +-
 drivers/scsi/dmx3191d.c                |    2 +-
 drivers/scsi/ipr.c                     |    2 +-
 drivers/scsi/ips.c                     |    2 +-
 drivers/scsi/megaraid.c                |    2 +-
 drivers/scsi/megaraid/megaraid_sas.c   |    2 +-
 drivers/scsi/nsp32.c                   |    2 +-
 drivers/scsi/pdc_adma.c                |    2 +-
 drivers/scsi/qla1280.c                 |    2 +-
 drivers/scsi/qla2xxx/ql2100.c          |    2 +-
 drivers/scsi/qla2xxx/ql2200.c          |    2 +-
 drivers/scsi/qla2xxx/ql2300.c          |    2 +-
 drivers/scsi/qla2xxx/ql2322.c          |    2 +-
 drivers/scsi/qla2xxx/ql6312.c          |    2 +-
 drivers/scsi/qla2xxx/qla_os.c          |    2 +-
 drivers/scsi/sata_mv.c                 |    2 +-
 drivers/scsi/sata_nv.c                 |    2 +-
 drivers/scsi/sata_promise.c            |    2 +-
 drivers/scsi/sata_qstor.c              |    2 +-
 drivers/scsi/sata_sil.c                |    2 +-
 drivers/scsi/sata_sil24.c              |    2 +-
 drivers/scsi/sata_sis.c                |    2 +-
 drivers/scsi/sata_svw.c                |    2 +-
 drivers/scsi/sata_sx4.c                |    2 +-
 drivers/scsi/sata_uli.c                |    2 +-
 drivers/scsi/sata_via.c                |    2 +-
 drivers/scsi/sata_vsc.c                |    2 +-
 drivers/scsi/tmscsim.c                 |    2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

applies-to: bbfea846e5360ffdd245fb04b9e5680457b56994 c67a3af36f75ae7b8923a8c332ccdfdeb1f3dbc9

drivers/scsi/3w-9xxx.c +1 -1
index 3ff74f4..954bc4b 100644
@@ -2206,7 +2206,7 @@ static int __init twa_init(void)
 {
 	printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
 
-	return pci_module_init(&twa_driver);
+	return pci_register_driver(&twa_driver);
 } /* End twa_init() */
 
 /* This function is called on driver exit */
drivers/scsi/3w-xxxx.c +1 -1
index 283f6d2..fdc1359 100644
@@ -2482,7 +2482,7 @@ static int __init tw_init(void)
 {
 	printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
 
-	return pci_module_init(&tw_driver);
+	return pci_register_driver(&tw_driver);
 } /* End tw_init() */
 
 /* This function is called on driver exit */
drivers/scsi/a100u2w.c +1 -1
index 9f45ae1..2944dc6 100644
@@ -1186,7 +1186,7 @@ static struct pci_driver inia100_pci_dri
 
 static int __init inia100_init(void)
 {
-	return pci_module_init(&inia100_pci_driver);
+	return pci_register_driver(&inia100_pci_driver);
 }
 
 static void __exit inia100_exit(void)
drivers/scsi/ahci.c +1 -1
index 83467a0..92c5b83 100644
@@ -1140,7 +1140,7 @@ static void ahci_remove_one (struct pci_
 
 static int __init ahci_init(void)
 {
-	return pci_module_init(&ahci_pci_driver);
+	return pci_register_driver(&ahci_pci_driver);
 }
 
 static void __exit ahci_exit(void)
drivers/scsi/aic7xxx/aic79xx_osm_pci.c +1 -1
index bf360ae..12872af 100644
@@ -198,7 +198,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
 int
 ahd_linux_pci_init(void)
 {
-	return (pci_module_init(&aic79xx_pci_driver));
+	return (pci_register_driver(&aic79xx_pci_driver));
 }
 
 void
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +1 -1
index cb30d9c..bb89827 100644
@@ -246,7 +246,7 @@ int
 ahc_linux_pci_init(void)
 {
 	/* Translate error or zero return into zero or one */
-	return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1;
+	return pci_register_driver(&aic7xxx_pci_driver) ? 0 : 1;
 }
 
 void
drivers/scsi/ata_piix.c +2 -2
index 333d69d..3c1aa25 100644
@@ -684,8 +684,8 @@ static int __init piix_init(void)
 {
 	int rc;
 
-	DPRINTK("pci_module_init\n");
-	rc = pci_module_init(&piix_pci_driver);
+	DPRINTK("pci_register_driver\n");
+	rc = pci_register_driver(&piix_pci_driver);
 	if (rc)
 		return rc;
drivers/scsi/dc395x.c +1 -1
index c8a32cf..3d19215 100644
@@ -4921,7 +4921,7 @@ static struct pci_driver dc395x_driver =
  **/
 static int __init dc395x_module_init(void)
 {
-	return pci_module_init(&dc395x_driver);
+	return pci_register_driver(&dc395x_driver);
 }
drivers/scsi/dmx3191d.c +1 -1
index 7905b90..46aaaf8 100644
@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_dr
 
 static int __init dmx3191d_init(void)
 {
-	return pci_module_init(&dmx3191d_pci_driver);
+	return pci_register_driver(&dmx3191d_pci_driver);
 }
 
 static void __exit dmx3191d_exit(void)
drivers/scsi/ipr.c +1 -1
index fa2cb35..89e6757 100644
@@ -6644,7 +6644,7 @@ static int __init ipr_init(void)
 	ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
 		 IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
 
-	return pci_module_init(&ipr_driver);
+	return pci_register_driver(&ipr_driver);
 }
 
 /**
drivers/scsi/ips.c +1 -1
index 3882d48..5bb9670 100644
@@ -7073,7 +7073,7 @@ ips_remove_device(struct pci_dev *pci_de
 static int __init
 ips_module_init(void)
 {
-	if (pci_module_init(&ips_pci_driver) < 0)
+	if (pci_register_driver(&ips_pci_driver) < 0)
 		return -ENODEV;
 	ips_driver_template.module = THIS_MODULE;
 	ips_order_controllers();
drivers/scsi/megaraid.c +1 -1
index f979252..085c430 100644
@@ -5081,7 +5081,7 @@ static int __init megaraid_init(void)
 				"megaraid: failed to create megaraid root\n");
 	}
 #endif
-	error = pci_module_init(&megaraid_pci_driver);
+	error = pci_register_driver(&megaraid_pci_driver);
 	if (error) {
 #ifdef CONFIG_PROC_FS
 		remove_proc_entry("megaraid", &proc_root);
drivers/scsi/megaraid/megaraid_sas.c +1 -1
index 3c32e69..1cd5c6c 100644
@@ -2768,7 +2768,7 @@ static int __init megasas_init(void)
 	/*
 	 * Register ourselves as PCI hotplug module
 	 */
-	rval = pci_module_init(&megasas_pci_driver);
+	rval = pci_register_driver(&megasas_pci_driver);
 
 	if (rval) {
 		printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n");
drivers/scsi/nsp32.c +1 -1
index a279ebb..0c0f25f 100644
@@ -3574,7 +3574,7 @@ static struct pci_driver nsp32_driver = 
  */
 static int __init init_nsp32(void) {
 	nsp32_msg(KERN_INFO, "loading...");
-	return pci_module_init(&nsp32_driver);
+	return pci_register_driver(&nsp32_driver);
 }
 
 static void __exit exit_nsp32(void) {
drivers/scsi/pdc_adma.c +1 -1
index f557f17..0c99b54 100644
@@ -722,7 +722,7 @@ err_out:
 
 static int __init adma_ata_init(void)
 {
-	return pci_module_init(&adma_ata_pci_driver);
+	return pci_register_driver(&adma_ata_pci_driver);
 }
 
 static void __exit adma_ata_exit(void)
drivers/scsi/qla1280.c +1 -1
index 0878f95..3f4a4a3 100644
@@ -4772,7 +4772,7 @@ qla1280_init(void)
 		qla1280_setup(qla1280);
 #endif
 
-	return pci_module_init(&qla1280_pci_driver);
+	return pci_register_driver(&qla1280_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/ql2100.c +1 -1
index f5db223..e5e7185 100644
@@ -73,7 +73,7 @@ static struct pci_driver qla2100_pci_dri
 static int __init
 qla2100_init(void)
 {
-	return pci_module_init(&qla2100_pci_driver);
+	return pci_register_driver(&qla2100_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/ql2200.c +1 -1
index 0eef72d..519e750 100644
@@ -73,7 +73,7 @@ static struct pci_driver qla2200_pci_dri
 static int __init
 qla2200_init(void)
 {
-	return pci_module_init(&qla2200_pci_driver);
+	return pci_register_driver(&qla2200_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/ql2300.c +1 -1
index fd2f4b7..8289f46 100644
@@ -84,7 +84,7 @@ static struct pci_driver qla2300_pci_dri
 static int __init
 qla2300_init(void)
 {
-	return pci_module_init(&qla2300_pci_driver);
+	return pci_register_driver(&qla2300_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/ql2322.c +1 -1
index c88a22c..0633a21 100644
@@ -89,7 +89,7 @@ static struct pci_driver qla2322_pci_dri
 static int __init
 qla2322_init(void)
 {
-	return pci_module_init(&qla2322_pci_driver);
+	return pci_register_driver(&qla2322_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/ql6312.c +1 -1
index de55397..3c80dcb 100644
@@ -83,7 +83,7 @@ static struct pci_driver qla6312_pci_dri
 static int __init
 qla6312_init(void)
 {
-	return pci_module_init(&qla6312_pci_driver);
+	return pci_register_driver(&qla6312_pci_driver);
 }
 
 static void __exit
drivers/scsi/qla2xxx/qla_os.c +1 -1
index c58c9d9..e8c647b 100644
@@ -2565,7 +2565,7 @@ qla2x00_module_init(void)
 		return -ENODEV;
 
 	printk(KERN_INFO "QLogic Fibre Channel HBA Driver\n");
-	ret = pci_module_init(&qla2xxx_pci_driver);
+	ret = pci_register_driver(&qla2xxx_pci_driver);
 	if (ret) {
 		kmem_cache_destroy(srb_cachep);
 		fc_release_transport(qla2xxx_transport_template);
drivers/scsi/sata_mv.c +1 -1
index ab7432a..31eb12d 100644
@@ -2229,7 +2229,7 @@ err_out:
 
 static int __init mv_init(void)
 {
-	return pci_module_init(&mv_pci_driver);
+	return pci_register_driver(&mv_pci_driver);
 }
 
 static void __exit mv_exit(void)
drivers/scsi/sata_nv.c +1 -1
index 4954896..a76ffd9 100644
@@ -591,7 +591,7 @@ static void nv_check_hotplug_ck804(struc
 
 static int __init nv_init(void)
 {
-	return pci_module_init(&nv_pci_driver);
+	return pci_register_driver(&nv_pci_driver);
 }
 
 static void __exit nv_exit(void)
drivers/scsi/sata_promise.c +1 -1
index 8a8e3e3..e8dff47 100644
@@ -743,7 +743,7 @@ err_out:
 
 static int __init pdc_ata_init(void)
 {
-	return pci_module_init(&pdc_ata_pci_driver);
+	return pci_register_driver(&pdc_ata_pci_driver);
 }
drivers/scsi/sata_qstor.c +1 -1
index a8987f5..8824174 100644
@@ -712,7 +712,7 @@ err_out:
 
 static int __init qs_ata_init(void)
 {
-	return pci_module_init(&qs_ata_pci_driver);
+	return pci_register_driver(&qs_ata_pci_driver);
 }
 
 static void __exit qs_ata_exit(void)
drivers/scsi/sata_sil.c +1 -1
index 3609186..e9cc283 100644
@@ -512,7 +512,7 @@ err_out:
 
 static int __init sil_init(void)
 {
-	return pci_module_init(&sil_pci_driver);
+	return pci_register_driver(&sil_pci_driver);
 }
 
 static void __exit sil_exit(void)
drivers/scsi/sata_sil24.c +1 -1
index e0d6f19..4f01e30 100644
@@ -1017,7 +1017,7 @@ static int sil24_init_one(struct pci_dev
 
 static int __init sil24_init(void)
 {
-	return pci_module_init(&sil24_pci_driver);
+	return pci_register_driver(&sil24_pci_driver);
 }
 
 static void __exit sil24_exit(void)
drivers/scsi/sata_sis.c +1 -1
index 32e1262..ceda6ad 100644
@@ -335,7 +335,7 @@ err_out:
 
 static int __init sis_init(void)
 {
-	return pci_module_init(&sis_pci_driver);
+	return pci_register_driver(&sis_pci_driver);
 }
 
 static void __exit sis_exit(void)
drivers/scsi/sata_svw.c +1 -1
index 6e7f7c8..55e0675 100644
@@ -485,7 +485,7 @@ static struct pci_driver k2_sata_pci_dri
 
 static int __init k2_sata_init(void)
 {
-	return pci_module_init(&k2_sata_pci_driver);
+	return pci_register_driver(&k2_sata_pci_driver);
 }
drivers/scsi/sata_sx4.c +1 -1
index dcc3ad9..bae1847 100644
@@ -1495,7 +1495,7 @@ err_out:
 
 static int __init pdc_sata_init(void)
 {
-	return pci_module_init(&pdc_sata_pci_driver);
+	return pci_register_driver(&pdc_sata_pci_driver);
 }
drivers/scsi/sata_uli.c +1 -1
index b2422a0..5669611 100644
@@ -272,7 +272,7 @@ err_out:
 
 static int __init uli_init(void)
 {
-	return pci_module_init(&uli_pci_driver);
+	return pci_register_driver(&uli_pci_driver);
 }
 
 static void __exit uli_exit(void)
drivers/scsi/sata_via.c +1 -1
index c762156..63a77d3 100644
@@ -382,7 +382,7 @@ err_out:
 
 static int __init svia_init(void)
 {
-	return pci_module_init(&svia_pci_driver);
+	return pci_register_driver(&svia_pci_driver);
 }
 
 static void __exit svia_exit(void)
drivers/scsi/sata_vsc.c +1 -1
index fcfa486..be6cf48 100644
@@ -417,7 +417,7 @@ static struct pci_driver vsc_sata_pci_dr
 
 static int __init vsc_sata_init(void)
 {
-	return pci_module_init(&vsc_sata_pci_driver);
+	return pci_register_driver(&vsc_sata_pci_driver);
 }
drivers/scsi/tmscsim.c +1 -1
index 91322af..f86a74c 100644
@@ -2671,7 +2671,7 @@ static int __init dc390_module_init(void
 		printk (KERN_INFO "DC390: Using safe settings.\n");
 	}
 
-	return pci_module_init(&dc390_driver);
+	return pci_register_driver(&dc390_driver);
 }
 
 static void __exit dc390_module_exit(void)

---
0.99.9k

author
#2 lore raw

PATCH 3/11 SERIAL: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/serial/serial_txx9.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: a666494f7286f5723e4196c76bb77f532c2f7871 82c55929cb91abb75b3b47a46bcba6ef212702fd

drivers/serial/serial_txx9.c +1 -1
index f10c86d..995d9dd 100644
@@ -1195,7 +1195,7 @@ static int __init serial_txx9_init(void)
 		serial_txx9_register_ports(&serial_txx9_reg);
 
 #ifdef ENABLE_SERIAL_TXX9_PCI
-		ret = pci_module_init(&serial_txx9_pci_driver);
+		ret = pci_register_driver(&serial_txx9_pci_driver);
 #endif
 	}
 	return ret;

---
0.99.9k

author
#3 lore raw

PATCH 4/11 VIDEO: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/video/cyblafb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 7d96fbf2c9eb2d18e807891c7023feccd36ae096 4ea77b4a082ec82dbf3b34b6334888cbac61bbe3

drivers/video/cyblafb.c +1 -1
index 03fbe83..b2d7476 100644
@@ -1440,7 +1440,7 @@ static int __devinit cyblafb_init(void)
 		}
 #endif
 	output("CyblaFB version %s initializing\n",VERSION);
-	return pci_module_init(&cyblafb_pci_driver);
+	return pci_register_driver(&cyblafb_pci_driver);
 }
 
 static void __exit cyblafb_exit(void)

---
0.99.9k

author
#4 lore raw

PATCH 5/11 NET: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/net/3c59x.c                           |    2 +-
 drivers/net/8139cp.c                          |    2 +-
 drivers/net/8139too.c                         |    2 +-
 drivers/net/acenic.c                          |    2 +-
 drivers/net/amd8111e.c                        |    2 +-
 drivers/net/arcnet/com20020-pci.c             |    2 +-
 drivers/net/b44.c                             |    2 +-
 drivers/net/bnx2.c                            |    2 +-
 drivers/net/cassini.c                         |    2 +-
 drivers/net/chelsio/cxgb2.c                   |    2 +-
 drivers/net/defxx.c                           |    2 +-
 drivers/net/dl2k.c                            |    2 +-
 drivers/net/e100.c                            |    2 +-
 drivers/net/e1000/e1000_main.c                |    2 +-
 drivers/net/eepro100.c                        |    2 +-
 drivers/net/epic100.c                         |    2 +-
 drivers/net/fealnx.c                          |    2 +-
 drivers/net/forcedeth.c                       |    2 +-
 drivers/net/hp100.c                           |    2 +-
 drivers/net/irda/donauboe.c                   |    2 +-
 drivers/net/irda/vlsi_ir.c                    |    2 +-
 drivers/net/ixgb/ixgb_main.c                  |    2 +-
 drivers/net/natsemi.c                         |    2 +-
 drivers/net/ne2k-pci.c                        |    2 +-
 drivers/net/ns83820.c                         |    2 +-
 drivers/net/pci-skeleton.c                    |    2 +-
 drivers/net/pcnet32.c                         |    2 +-
 drivers/net/r8169.c                           |    2 +-
 drivers/net/rrunner.c                         |    2 +-
 drivers/net/s2io.c                            |    2 +-
 drivers/net/saa9730.c                         |    2 +-
 drivers/net/sis190.c                          |    2 +-
 drivers/net/sis900.c                          |    2 +-
 drivers/net/skfp/skfddi.c                     |    2 +-
 drivers/net/skge.c                            |    2 +-
 drivers/net/starfire.c                        |    2 +-
 drivers/net/sundance.c                        |    2 +-
 drivers/net/sungem.c                          |    2 +-
 drivers/net/tc35815.c                         |    2 +-
 drivers/net/tg3.c                             |    2 +-
 drivers/net/tokenring/3c359.c                 |    2 +-
 drivers/net/tokenring/lanstreamer.c           |    2 +-
 drivers/net/tokenring/olympic.c               |    2 +-
 drivers/net/tulip/de2104x.c                   |    2 +-
 drivers/net/tulip/de4x5.c                     |    2 +-
 drivers/net/tulip/dmfe.c                      |    2 +-
 drivers/net/tulip/tulip_core.c                |    2 +-
 drivers/net/tulip/uli526x.c                   |    2 +-
 drivers/net/tulip/winbond-840.c               |    2 +-
 drivers/net/tulip/xircom_tulip_cb.c           |    2 +-
 drivers/net/typhoon.c                         |    2 +-
 drivers/net/via-rhine.c                       |    2 +-
 drivers/net/via-velocity.c                    |    2 +-
 drivers/net/wan/dscc4.c                       |    2 +-
 drivers/net/wan/farsync.c                     |    2 +-
 drivers/net/wan/lmc/lmc_main.c                |    2 +-
 drivers/net/wan/pc300_drv.c                   |    2 +-
 drivers/net/wan/pci200syn.c                   |    2 +-
 drivers/net/wan/wanxl.c                       |    2 +-
 drivers/net/wireless/atmel_pci.c              |    2 +-
 drivers/net/wireless/ipw2100.c                |    2 +-
 drivers/net/wireless/ipw2200.c                |    2 +-
 drivers/net/wireless/orinoco_nortel.c         |    2 +-
 drivers/net/wireless/orinoco_pci.c            |    2 +-
 drivers/net/wireless/orinoco_plx.c            |    2 +-
 drivers/net/wireless/orinoco_tmd.c            |    2 +-
 drivers/net/wireless/prism54/islpci_hotplug.c |    2 +-
 drivers/net/yellowfin.c                       |    2 +-
 68 files changed, 68 insertions(+), 68 deletions(-)

applies-to: 309b3a61c2d9ccddf631182412f70319775c32c3 7c16b7463d474c538e6010ad895d39328dc87531

drivers/net/3c59x.c +1 -1
index 7488ee7..b403923 100644
@@ -3367,7 +3367,7 @@ static int __init vortex_init (void)
 {
 	int pci_rc, eisa_rc;
 
-	pci_rc = pci_module_init(&vortex_driver);
+	pci_rc = pci_register_driver(&vortex_driver);
 	eisa_rc = vortex_eisa_init();
 
 	if (pci_rc == 0)
drivers/net/8139cp.c +1 -1
index f822cd3..6cbf944 100644
@@ -1939,7 +1939,7 @@ static int __init cp_init (void)
 #ifdef MODULE
 	printk("%s", version);
 #endif
-	return pci_module_init (&cp_driver);
+	return pci_register_driver (&cp_driver);
 }
 
 static void __exit cp_exit (void)
drivers/net/8139too.c +1 -1
index 30bee11..4a6445d 100644
@@ -2635,7 +2635,7 @@ static int __init rtl8139_init_module (v
 	printk (KERN_INFO RTL8139_DRIVER_NAME "\n");
 #endif
 
-	return pci_module_init (&rtl8139_pci_driver);
+	return pci_register_driver (&rtl8139_pci_driver);
 }
drivers/net/acenic.c +1 -1
index b8953de..016f1c2 100644
@@ -730,7 +730,7 @@ static struct pci_driver acenic_pci_driv
 
 static int __init acenic_init(void)
 {
-	return pci_module_init(&acenic_pci_driver);
+	return pci_register_driver(&acenic_pci_driver);
 }
 
 static void __exit acenic_exit(void)
drivers/net/amd8111e.c +1 -1
index d9ba8be..bee8451 100644
@@ -2159,7 +2159,7 @@ static struct pci_driver amd8111e_driver
 
 static int __init amd8111e_init(void)
 {
-	return pci_module_init(&amd8111e_driver);
+	return pci_register_driver(&amd8111e_driver);
 }
 
 static void __exit amd8111e_cleanup(void)
drivers/net/arcnet/com20020-pci.c +1 -1
index 96636ca..c0fa5c8 100644
@@ -177,7 +177,7 @@ static struct pci_driver com20020pci_dri
 static int __init com20020pci_init(void)
 {
 	BUGLVL(D_NORMAL) printk(VERSION);
-	return pci_module_init(&com20020pci_driver);
+	return pci_register_driver(&com20020pci_driver);
 }
 
 static void __exit com20020pci_cleanup(void)
drivers/net/b44.c +1 -1
index 7aa49b9..7857de9 100644
@@ -2138,7 +2138,7 @@ static int __init b44_init(void)
 	dma_desc_align_mask = ~(dma_desc_align_size - 1);
 	dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
 
-	return pci_module_init(&b44_driver);
+	return pci_register_driver(&b44_driver);
 }
 
 static void __exit b44_cleanup(void)
drivers/net/bnx2.c +1 -1
index 49fa1e4..a58cb86 100644
@@ -5849,7 +5849,7 @@ static struct pci_driver bnx2_pci_driver
 
 static int __init bnx2_init(void)
 {
-	return pci_module_init(&bnx2_pci_driver);
+	return pci_register_driver(&bnx2_pci_driver);
 }
 
 static void __exit bnx2_cleanup(void)
drivers/net/cassini.c +1 -1
index 1f7ca45..36079ca 100644
@@ -5224,7 +5224,7 @@ static int __init cas_init(void)
 	else
 		link_transition_timeout = 0;
 
-	return pci_module_init(&cas_driver);
+	return pci_register_driver(&cas_driver);
 }
 
 static void __exit cas_cleanup(void)
drivers/net/chelsio/cxgb2.c +1 -1
index 349ebe7..bf712b3 100644
@@ -1244,7 +1244,7 @@ static struct pci_driver driver = {
 
 static int __init t1_init_module(void)
 {
-	return pci_module_init(&driver);
+	return pci_register_driver(&driver);
 }
 
 static void __exit t1_cleanup_module(void)
drivers/net/defxx.c +1 -1
index 5acd35c..1ac4545 100644
@@ -3444,7 +3444,7 @@ static int __init dfx_init(void)
 {
 	int rc_pci, rc_eisa;
 
-	rc_pci = pci_module_init(&dfx_driver);
+	rc_pci = pci_register_driver(&dfx_driver);
 	if (rc_pci >= 0) dfx_have_pci = 1;
 	
 	rc_eisa = dfx_eisa_init();
drivers/net/dl2k.c +1 -1
index 430c628..c738098 100644
@@ -1848,7 +1848,7 @@ static struct pci_driver rio_driver = {
 static int __init
 rio_init (void)
 {
-	return pci_module_init (&rio_driver);
+	return pci_register_driver (&rio_driver);
 }
 
 static void __exit
drivers/net/e100.c +1 -1
index 22cd045..ab1a8a5 100644
@@ -2722,7 +2722,7 @@ static int __init e100_init_module(void)
 		printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
 		printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT);
 	}
-	return pci_module_init(&e100_driver);
+	return pci_register_driver(&e100_driver);
 }
 
 static void __exit e100_cleanup_module(void)
drivers/net/e1000/e1000_main.c +1 -1
index e0ae248..180ef80 100644
@@ -247,7 +247,7 @@ e1000_init_module(void)
 
 	printk(KERN_INFO "%s\n", e1000_copyright);
 
-	ret = pci_module_init(&e1000_driver);
+	ret = pci_register_driver(&e1000_driver);
 
 	return ret;
 }
drivers/net/eepro100.c +1 -1
index 8c62ced..587c7d5 100644
@@ -2391,7 +2391,7 @@ static int __init eepro100_init_module(v
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init(&eepro100_driver);
+	return pci_register_driver(&eepro100_driver);
 }
 
 static void __exit eepro100_cleanup_module(void)
drivers/net/epic100.c +1 -1
index f119ec4..d71c0e9 100644
@@ -1673,7 +1673,7 @@ static int __init epic_init (void)
 		version, version2, version3);
 #endif
 
-	return pci_module_init (&epic_driver);
+	return pci_register_driver (&epic_driver);
 }
drivers/net/fealnx.c +1 -1
index 55dbe9a..bfe1272 100644
@@ -1992,7 +1992,7 @@ static int __init fealnx_init(void)
 	printk(version);
 #endif
 
-	return pci_module_init(&fealnx_driver);
+	return pci_register_driver(&fealnx_driver);
 }
 
 static void __exit fealnx_exit(void)
drivers/net/forcedeth.c +1 -1
index 525624f..7739f15 100644
@@ -2720,7 +2720,7 @@ static struct pci_driver driver = {
 static int __init init_nic(void)
 {
 	printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION);
-	return pci_module_init(&driver);
+	return pci_register_driver(&driver);
 }
 
 static void __exit exit_nic(void)
drivers/net/hp100.c +1 -1
index e92c17f..86c2662 100644
@@ -3048,7 +3048,7 @@ static int __init hp100_module_init(void
 		goto out2;
 #endif
 #ifdef CONFIG_PCI
-	err = pci_module_init(&hp100_pci_driver);
+	err = pci_register_driver(&hp100_pci_driver);
 	if (err && err != -ENODEV) 
 		goto out3;
 #endif
drivers/net/irda/donauboe.c +1 -1
index 3137592..910c0ca 100644
@@ -1778,7 +1778,7 @@ static struct pci_driver donauboe_pci_dr
 static int __init
 donauboe_init (void)
 {
-  return pci_module_init(&donauboe_pci_driver);
+  return pci_register_driver(&donauboe_pci_driver);
 }
 
 static void __exit
drivers/net/irda/vlsi_ir.c +1 -1
index a9f49f0..97a49e0 100644
@@ -1887,7 +1887,7 @@ static int __init vlsi_mod_init(void)
 		vlsi_proc_root->owner = THIS_MODULE;
 	}
 
-	ret = pci_module_init(&vlsi_irda_driver);
+	ret = pci_register_driver(&vlsi_irda_driver);
 
 	if (ret && vlsi_proc_root)
 		remove_proc_entry(PROC_DIR, NULL);
drivers/net/ixgb/ixgb_main.c +1 -1
index f9f77e4..a7ee7a9 100644
@@ -171,7 +171,7 @@ ixgb_init_module(void)
 
 	printk(KERN_INFO "%s\n", ixgb_copyright);
 
-	return pci_module_init(&ixgb_driver);
+	return pci_register_driver(&ixgb_driver);
 }
 
 module_init(ixgb_init_module);
drivers/net/natsemi.c +1 -1
index 9d6d254..f61d090 100644
@@ -3260,7 +3260,7 @@ static int __init natsemi_init_mod (void
 	printk(version);
 #endif
 
-	return pci_module_init (&natsemi_driver);
+	return pci_register_driver (&natsemi_driver);
 }
 
 static void __exit natsemi_exit_mod (void)
drivers/net/ne2k-pci.c +1 -1
index d11821d..e326dbc 100644
@@ -703,7 +703,7 @@ static int __init ne2k_pci_init(void)
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init (&ne2k_driver);
+	return pci_register_driver (&ne2k_driver);
 }
drivers/net/ns83820.c +1 -1
index f857ae9..34ef031 100644
@@ -2175,7 +2175,7 @@ static struct pci_driver driver = {
 static int __init ns83820_init(void)
 {
 	printk(KERN_INFO "ns83820.c: National Semiconductor DP83820 10/100/1000 driver.\n");
-	return pci_module_init(&driver);
+	return pci_register_driver(&driver);
 }
 
 static void __exit ns83820_exit(void)
drivers/net/pci-skeleton.c +1 -1
index a1ac4bd..0bd53d4 100644
@@ -1963,7 +1963,7 @@ static int __init netdrv_init_module (vo
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init (&netdrv_pci_driver);
+	return pci_register_driver (&netdrv_pci_driver);
 }
drivers/net/pcnet32.c +1 -1
index be31922..b8cc648 100644
@@ -2513,7 +2513,7 @@ static int __init pcnet32_init_module(vo
 	tx_start = tx_start_pt;
 
     /* find the PCI devices */
-    if (!pci_module_init(&pcnet32_driver))
+    if (!pci_register_driver(&pcnet32_driver))
 	pcnet32_have_pci = 1;
 
     /* should we find any remaining VLbus devices ? */
drivers/net/r8169.c +1 -1
index 14a76f7..8470a17 100644
@@ -2713,7 +2713,7 @@ static struct pci_driver rtl8169_pci_dri
 static int __init
 rtl8169_init_module(void)
 {
-	return pci_module_init(&rtl8169_pci_driver);
+	return pci_register_driver(&rtl8169_pci_driver);
 }
 
 static void __exit
drivers/net/rrunner.c +1 -1
index 19c2df9..9262d27 100644
@@ -1737,7 +1737,7 @@ static struct pci_driver rr_driver = {
 
 static int __init rr_init_module(void)
 {
-	return pci_module_init(&rr_driver);
+	return pci_register_driver(&rr_driver);
 }
 
 static void __exit rr_cleanup_module(void)
drivers/net/s2io.c +1 -1
index e57df8d..fb30142 100644
@@ -6297,7 +6297,7 @@ static void __devexit s2io_rem_nic(struc
 
 int __init s2io_starter(void)
 {
-	return pci_module_init(&s2io_driver);
+	return pci_register_driver(&s2io_driver);
 }
 
 /**
drivers/net/saa9730.c +1 -1
index b2acedb..c479b07 100644
@@ -1131,7 +1131,7 @@ static struct pci_driver saa9730_driver 
 
 static int __init saa9730_init(void)
 {
-	return pci_module_init(&saa9730_driver);
+	return pci_register_driver(&saa9730_driver);
 }
 
 static void __exit saa9730_cleanup(void)
drivers/net/sis190.c +1 -1
index 478791e..7ec938a 100644
@@ -1872,7 +1872,7 @@ static struct pci_driver sis190_pci_driv
 
 static int __init sis190_init_module(void)
 {
-	return pci_module_init(&sis190_pci_driver);
+	return pci_register_driver(&sis190_pci_driver);
 }
 
 static void __exit sis190_cleanup_module(void)
drivers/net/sis900.c +1 -1
index 1d4d886..e83a46b 100644
@@ -2410,7 +2410,7 @@ static int __init sis900_init_module(voi
 	printk(version);
 #endif
 
-	return pci_module_init(&sis900_pci_driver);
+	return pci_register_driver(&sis900_pci_driver);
 }
 
 static void __exit sis900_cleanup_module(void)
drivers/net/skfp/skfddi.c +1 -1
index 4b5ed2c..a59a4e4 100644
@@ -2280,7 +2280,7 @@ static struct pci_driver skfddi_pci_driv
 
 static int __init skfd_init(void)
 {
-	return pci_module_init(&skfddi_pci_driver);
+	return pci_register_driver(&skfddi_pci_driver);
 }
 
 static void __exit skfd_exit(void)
drivers/net/skge.c +1 -1
index 7164678..da640d0 100644
@@ -3417,7 +3417,7 @@ static struct pci_driver skge_driver = {
 
 static int __init skge_init_module(void)
 {
-	return pci_module_init(&skge_driver);
+	return pci_register_driver(&skge_driver);
 }
 
 static void __exit skge_cleanup_module(void)
drivers/net/starfire.c +1 -1
index d167ded..9002b6c 100644
@@ -2137,7 +2137,7 @@ static int __init starfire_init (void)
 		return -ENODEV;
 	}
 
-	return pci_module_init (&starfire_driver);
+	return pci_register_driver (&starfire_driver);
 }
drivers/net/sundance.c +1 -1
index 0ab9c38..c9ad132 100644
@@ -1806,7 +1806,7 @@ static int __init sundance_init(void)
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init(&sundance_driver);
+	return pci_register_driver(&sundance_driver);
 }
 
 static void __exit sundance_exit(void)
drivers/net/sungem.c +1 -1
index 081717d..fb71ce4 100644
@@ -3190,7 +3190,7 @@ static struct pci_driver gem_driver = {
 
 static int __init gem_init(void)
 {
-	return pci_module_init(&gem_driver);
+	return pci_register_driver(&gem_driver);
 }
 
 static void __exit gem_cleanup(void)
drivers/net/tc35815.c +1 -1
index c2ec9fd..a44ea20 100644
@@ -1725,7 +1725,7 @@ static struct pci_driver tc35815_driver 
 
 static int __init tc35815_init_module(void)
 {
-	return pci_module_init(&tc35815_driver);
+	return pci_register_driver(&tc35815_driver);
 }
 
 static void __exit tc35815_cleanup_module(void)
drivers/net/tg3.c +1 -1
index 1828a6b..8189da7 100644
@@ -10879,7 +10879,7 @@ static struct pci_driver tg3_driver = {
 
 static int __init tg3_init(void)
 {
-	return pci_module_init(&tg3_driver);
+	return pci_register_driver(&tg3_driver);
 }
 
 static void __exit tg3_cleanup(void)
drivers/net/tokenring/3c359.c +1 -1
index 41e0cd8..0d0ed94 100644
@@ -1816,7 +1816,7 @@ static struct pci_driver xl_3c359_driver
 
 static int __init xl_pci_init (void)
 {
-	return pci_module_init (&xl_3c359_driver);
+	return pci_register_driver (&xl_3c359_driver);
 }
drivers/net/tokenring/lanstreamer.c +1 -1
index 97712c3..0e7b5be 100644
@@ -1998,7 +1998,7 @@ static struct pci_driver streamer_pci_dr
 };
 
 static int __init streamer_init_module(void) {
-  return pci_module_init(&streamer_pci_driver);
+  return pci_register_driver(&streamer_pci_driver);
 }
 
 static void __exit streamer_cleanup_module(void) {
drivers/net/tokenring/olympic.c +1 -1
index 05477d2..2334024 100644
@@ -1771,7 +1771,7 @@ static struct pci_driver olympic_driver 
 
 static int __init olympic_pci_init(void) 
 {
-	return pci_module_init (&olympic_driver) ; 
+	return pci_register_driver (&olympic_driver) ; 
 }
 
 static void __exit olympic_pci_cleanup(void)
drivers/net/tulip/de2104x.c +1 -1
index d7fb3ff..448a9f1 100644
@@ -2178,7 +2178,7 @@ static int __init de_init (void)
 #ifdef MODULE
 	printk("%s", version);
 #endif
-	return pci_module_init (&de_driver);
+	return pci_register_driver (&de_driver);
 }
 
 static void __exit de_exit (void)
drivers/net/tulip/de4x5.c +1 -1
index ee48bfd..78e6c90 100644
@@ -5755,7 +5755,7 @@ static int __init de4x5_module_init (voi
 	int err = 0;
 
 #ifdef CONFIG_PCI
-	err = pci_module_init (&de4x5_pci_driver);
+	err = pci_register_driver (&de4x5_pci_driver);
 #endif
 #ifdef CONFIG_EISA
 	err |= eisa_driver_register (&de4x5_eisa_driver);
drivers/net/tulip/dmfe.c +1 -1
index 74e9075..ee57eea 100644
@@ -2039,7 +2039,7 @@ static int __init dmfe_init_module(void)
 	if (HPNA_NoiseFloor > 15)
 		HPNA_NoiseFloor = 0;
 
-	rc = pci_module_init(&dmfe_driver);
+	rc = pci_register_driver(&dmfe_driver);
 	if (rc < 0)
 		return rc;
drivers/net/tulip/tulip_core.c +1 -1
index 125ed00..5f82be9 100644
@@ -1854,7 +1854,7 @@ static int __init tulip_init (void)
 	tulip_max_interrupt_work = max_interrupt_work;
 
 	/* probe for and init boards */
-	return pci_module_init (&tulip_driver);
+	return pci_register_driver (&tulip_driver);
 }
drivers/net/tulip/uli526x.c +1 -1
index 1a43163..6318452 100644
@@ -1725,7 +1725,7 @@ static int __init uli526x_init_module(vo
 		break;
 	}
 
-	rc = pci_module_init(&uli526x_driver);
+	rc = pci_register_driver(&uli526x_driver);
 	if (rc < 0)
 		return rc;
drivers/net/tulip/winbond-840.c +1 -1
index 5b1af39..1d6bdc7 100644
@@ -1705,7 +1705,7 @@ static struct pci_driver w840_driver = {
 static int __init w840_init(void)
 {
 	printk(version);
-	return pci_module_init(&w840_driver);
+	return pci_register_driver(&w840_driver);
 }
 
 static void __exit w840_exit(void)
drivers/net/tulip/xircom_tulip_cb.c +1 -1
index 887d724..de94506 100644
@@ -1727,7 +1727,7 @@ static int __init xircom_init(void)
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init(&xircom_driver);
+	return pci_register_driver(&xircom_driver);
 }
drivers/net/typhoon.c +1 -1
index 4c76cb7..f677ed2 100644
@@ -2659,7 +2659,7 @@ static struct pci_driver typhoon_driver 
 static int __init
 typhoon_init(void)
 {
-	return pci_module_init(&typhoon_driver);
+	return pci_register_driver(&typhoon_driver);
 }
 
 static void __exit
drivers/net/via-rhine.c +1 -1
index 2418715..bd6cf61 100644
@@ -2049,7 +2049,7 @@ static int __init rhine_init(void)
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init(&rhine_driver);
+	return pci_register_driver(&rhine_driver);
 }
drivers/net/via-velocity.c +1 -1
index 82c6b75..266345b 100644
@@ -2241,7 +2241,7 @@ static int __init velocity_init_module(v
 	int ret;
 
 	velocity_register_notifier();
-	ret = pci_module_init(&velocity_driver);
+	ret = pci_register_driver(&velocity_driver);
 	if (ret < 0)
 		velocity_unregister_notifier();
 	return ret;
drivers/net/wan/dscc4.c +1 -1
index 2f61a47..2dcce40 100644
@@ -2061,7 +2061,7 @@ static struct pci_driver dscc4_driver = 
 
 static int __init dscc4_init_module(void)
 {
-	return pci_module_init(&dscc4_driver);
+	return pci_register_driver(&dscc4_driver);
 }
 
 static void __exit dscc4_cleanup_module(void)
drivers/net/wan/farsync.c +1 -1
index 7981a2c..2c71353 100644
@@ -2697,7 +2697,7 @@ fst_init(void)
 	for (i = 0; i < FST_MAX_CARDS; i++)
 		fst_card_array[i] = NULL;
 	spin_lock_init(&fst_work_q_lock);
-	return pci_module_init(&fst_driver);
+	return pci_register_driver(&fst_driver);
 }
 
 static void __exit
drivers/net/wan/lmc/lmc_main.c +1 -1
index 2b948ea..f5dba3f 100644
@@ -1790,7 +1790,7 @@ static struct pci_driver lmc_driver = {
 
 static int __init init_lmc(void)
 {
-    return pci_module_init(&lmc_driver);
+    return pci_register_driver(&lmc_driver);
 }
 
 static void __exit exit_lmc(void)
drivers/net/wan/pc300_drv.c +1 -1
index a3e65d1..0e5641e 100644
@@ -3677,7 +3677,7 @@ static struct pci_driver cpc_driver = {
 
 static int __init cpc_init(void)
 {
-	return pci_module_init(&cpc_driver);
+	return pci_register_driver(&cpc_driver);
 }
 
 static void __exit cpc_cleanup_module(void)
drivers/net/wan/pci200syn.c +1 -1
index 8dea07b..dc328f7 100644
@@ -468,7 +468,7 @@ static int __init pci200_init_module(voi
 		printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
 		return -EINVAL;
 	}
-	return pci_module_init(&pci200_pci_driver);
+	return pci_register_driver(&pci200_pci_driver);
 }
drivers/net/wan/wanxl.c +1 -1
index 9c1e106..c4c33f6 100644
@@ -822,7 +822,7 @@ static int __init wanxl_init_module(void
 #ifdef MODULE
 	printk(KERN_INFO "%s\n", version);
 #endif
-	return pci_module_init(&wanxl_pci_driver);
+	return pci_register_driver(&wanxl_pci_driver);
 }
 
 static void __exit wanxl_cleanup_module(void)
drivers/net/wireless/atmel_pci.c +1 -1
index a61b3bc..9de7ecb 100644
@@ -77,7 +77,7 @@ static void __devexit atmel_pci_remove(s
 
 static int __init atmel_init_module(void)
 {
-	return pci_module_init(&atmel_driver);
+	return pci_register_driver(&atmel_driver);
 }
 
 static void __exit atmel_cleanup_module(void)
drivers/net/wireless/ipw2100.c +1 -1
index 77d2a21..b1c1ede 100644
@@ -6856,7 +6856,7 @@ static int __init ipw2100_init(void)
 	printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
 	printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
 
-	ret = pci_module_init(&ipw2100_pci_driver);
+	ret = pci_register_driver(&ipw2100_pci_driver);
 
 #ifdef CONFIG_IPW_DEBUG
 	ipw2100_debug_level = debug;
drivers/net/wireless/ipw2200.c +1 -1
index 5e7c7e9..c9e2d6a 100644
@@ -11221,7 +11221,7 @@ static int __init ipw_init(void)
 	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
 	printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
 
-	ret = pci_module_init(&ipw_driver);
+	ret = pci_register_driver(&ipw_driver);
 	if (ret) {
 		IPW_ERROR("Unable to initialize PCI module\n");
 		return ret;
drivers/net/wireless/orinoco_nortel.c +1 -1
index d8afd51..eec27cb 100644
@@ -287,7 +287,7 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int __init nortel_pci_init(void)
 {
 	printk(KERN_DEBUG "%s\n", version);
-	return pci_module_init(&nortel_pci_driver);
+	return pci_register_driver(&nortel_pci_driver);
 }
 
 static void __exit nortel_pci_exit(void)
drivers/net/wireless/orinoco_pci.c +1 -1
index 5362c21..58883eb 100644
@@ -379,7 +379,7 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int __init orinoco_pci_init(void)
 {
 	printk(KERN_DEBUG "%s\n", version);
-	return pci_module_init(&orinoco_pci_driver);
+	return pci_register_driver(&orinoco_pci_driver);
 }
 
 static void __exit orinoco_pci_exit(void)
drivers/net/wireless/orinoco_plx.c +1 -1
index 210e737..708dae4 100644
@@ -382,7 +382,7 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int __init orinoco_plx_init(void)
 {
 	printk(KERN_DEBUG "%s\n", version);
-	return pci_module_init(&orinoco_plx_driver);
+	return pci_register_driver(&orinoco_plx_driver);
 }
 
 static void __exit orinoco_plx_exit(void)
drivers/net/wireless/orinoco_tmd.c +1 -1
index 5e68b70..6f04e81 100644
@@ -239,7 +239,7 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int __init orinoco_tmd_init(void)
 {
 	printk(KERN_DEBUG "%s\n", version);
-	return pci_module_init(&orinoco_tmd_driver);
+	return pci_register_driver(&orinoco_tmd_driver);
 }
 
 static void __exit orinoco_tmd_exit(void)
drivers/net/wireless/prism54/islpci_hotplug.c +1 -1
index b41d666..05aa311 100644
@@ -312,7 +312,7 @@ prism54_module_init(void)
 
 	__bug_on_wrong_struct_sizes ();
 
-	return pci_module_init(&prism54_driver);
+	return pci_register_driver(&prism54_driver);
 }
 
 /* by the time prism54_module_exit() terminates, as a postcondition
drivers/net/yellowfin.c +1 -1
index 1c25065..18c8359 100644
@@ -1474,7 +1474,7 @@ static int __init yellowfin_init (void)
 #ifdef MODULE
 	printk(version);
 #endif
-	return pci_module_init (&yellowfin_driver);
+	return pci_register_driver (&yellowfin_driver);
 }

---
0.99.9k

author
#5 lore raw

PATCH 6/11 i386: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 arch/i386/kernel/scx200.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 43d6f837c1b309ac228b08c4aa5cc6373646c699 d17794f0f6eca4998e47b9488964bb197e7d693f

arch/i386/kernel/scx200.c +1 -1
index 9c968ae..321f5fd 100644
@@ -143,7 +143,7 @@ static int __init scx200_init(void)
 {
 	printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
 
-	return pci_module_init(&scx200_pci_driver);
+	return pci_register_driver(&scx200_pci_driver);
 }
 
 static void __exit scx200_cleanup(void)

---
0.99.9k

author
#6 lore raw

PATCH 7/11 MIPS: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 arch/mips/vr41xx/common/vrc4173.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 0fa7b47cda82385f3b16c170a076809721fb7d39 a67da4b655b9699534d07b10cffca43d1e3dd83a

arch/mips/vr41xx/common/vrc4173.c +1 -1
index 462a9af..cc52e75 100644
@@ -561,7 +561,7 @@ static int __devinit vrc4173_init(void)
 {
 	int err;
 
-	err = pci_module_init(&vrc4173_driver);
+	err = pci_register_driver(&vrc4173_driver);
 	if (err < 0)
 		return err;

---
0.99.9k

author
#7 lore raw

PATCH 8/11 BLOCK: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/block/DAC960.c |    2 +-
 drivers/block/cciss.c  |    2 +-
 drivers/block/sx8.c    |    2 +-
 drivers/block/umem.c   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

applies-to: 9ec2473b134892f141036a7e662282e3db3f15bd c29562485d55591caa1cbf5eebd5ffb758eb6eb8

drivers/block/DAC960.c +1 -1
index 70eaa5c..fe044ee 100644
@@ -7186,7 +7186,7 @@ static int DAC960_init_module(void)
 {
 	int ret;
 
-	ret =  pci_module_init(&DAC960_pci_driver);
+	ret =  pci_register_driver(&DAC960_pci_driver);
 #ifdef DAC960_GAM_MINOR
 	if (!ret)
 		DAC960_gam_init();
drivers/block/cciss.c +1 -1
index a9e33db..1119a4d 100644
@@ -3275,7 +3275,7 @@ static int __init cciss_init(void)
 	printk(KERN_INFO DRIVER_NAME "\n");
 
 	/* Register for our PCI devices */
-	return pci_module_init(&cciss_pci_driver);
+	return pci_register_driver(&cciss_pci_driver);
 }
 
 static void __exit cciss_cleanup(void)
drivers/block/sx8.c +1 -1
index 1ded3b4..d0cafcf 100644
@@ -1774,7 +1774,7 @@ static void carm_remove_one (struct pci_
 
 static int __init carm_init(void)
 {
-	return pci_module_init(&carm_driver);
+	return pci_register_driver(&carm_driver);
 }
 
 static void __exit carm_exit(void)
drivers/block/umem.c +1 -1
index 0f48301..f5fd4f5 100644
@@ -1185,7 +1185,7 @@ static int __init mm_init(void)
 
 	printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
 
-	retval = pci_module_init(&mm_pci_driver);
+	retval = pci_register_driver(&mm_pci_driver);
 	if (retval)
 		return -ENOMEM;

---
0.99.9k

author
#8 lore raw

PATCH 9/11 MEDIA: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/media/radio/radio-gemtek-pci.c     |    2 +-
 drivers/media/radio/radio-maxiradio.c      |    2 +-
 drivers/media/video/bttv-driver.c          |    2 +-
 drivers/media/video/saa7134/saa7134-core.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

applies-to: f72516fc599b70f5507e6cf69b256b0da72b3646 fc3bbed930173e0784960f17cf67c229e652f6a0

drivers/media/radio/radio-gemtek-pci.c +1 -1
index 630cc78..78b2888 100644
@@ -394,7 +394,7 @@ static struct pci_driver gemtek_pci_driv
 
 static int __init gemtek_pci_init_module( void )
 {
-	return pci_module_init( &gemtek_pci_driver );
+	return pci_register_driver( &gemtek_pci_driver );
 }
 
 static void __exit gemtek_pci_cleanup_module( void )
drivers/media/radio/radio-maxiradio.c +1 -1
index 02d39a5..7b33d8f 100644
@@ -337,7 +337,7 @@ static struct pci_driver maxiradio_drive
 
 static int __init maxiradio_radio_init(void)
 {
-	return pci_module_init(&maxiradio_driver);
+	return pci_register_driver(&maxiradio_driver);
 }
 
 static void __exit maxiradio_radio_exit(void)
drivers/media/video/bttv-driver.c +1 -1
index 3c58a2a..cfb720d 100644
@@ -4253,7 +4253,7 @@ static int bttv_init_module(void)
 	bttv_check_chipset();
 
 	bus_register(&bttv_sub_bus_type);
-	return pci_module_init(&bttv_pci_driver);
+	return pci_register_driver(&bttv_pci_driver);
 }
 
 static void bttv_cleanup_module(void)
drivers/media/video/saa7134/saa7134-core.c +1 -1
index 1a093bf..18aa5d4 100644
@@ -1155,7 +1155,7 @@ static int saa7134_init(void)
 	printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n",
 	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
 #endif
-	return pci_module_init(&saa7134_pci_driver);
+	return pci_register_driver(&saa7134_pci_driver);
 }
 
 static void saa7134_fini(void)

---
0.99.9k

author
#9 lore raw

PATCH 10/11 PARPORT: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/parport/parport_serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 70d62cdda70b6e84fe0b2f8135423cc8fb3c3514 20666144f6463e5c0671ba3df6541b504dcb7e23

drivers/parport/parport_serial.c +1 -1
index d3dad0a..76dd077 100644
@@ -464,7 +464,7 @@ static struct pci_driver parport_serial_
 
 static int __init parport_serial_init (void)
 {
-	return pci_module_init (&parport_serial_pci_driver);
+	return pci_register_driver (&parport_serial_pci_driver);
 }
 
 static void __exit parport_serial_exit (void)

---
0.99.9k

author
#10 lore raw

PATCH 11/11 PCMCIA: replace all uses of pci_module_init with pci_register_driver

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>

---

 drivers/pcmcia/vrc4173_cardu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 7afc415186e22eea7e883c3885c692b91fda89e8 e52dc116e670cedc89ad7f4f6b5b9948022f272d

drivers/pcmcia/vrc4173_cardu.c +1 -1
index db91259..a64c4d5 100644
@@ -604,7 +604,7 @@ static int __devinit vrc4173_cardu_init(
 {
 	vrc4173_cardu_slots = 0;
 
-	return pci_module_init(&vrc4173_cardu_driver);
+	return pci_register_driver(&vrc4173_cardu_driver);
 }
 
 static void __devexit vrc4173_cardu_exit(void)

---
0.99.9k

Acked-by on v1 9/11
#11 lore raw

Re: [PATCH 9/11] MEDIA: replace all uses of pci_module_init with pci_register_driver

In reply to Otavio Salvador
Quoted 7 lines · Otavio Salvador

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Signed-off-by Otavio Salvador <[email protected]>
Acked-by Michael Krufky <[email protected]>
Quoted 74 lines

---

drivers/media/radio/radio-gemtek-pci.c     |    2 +-
drivers/media/radio/radio-maxiradio.c      |    2 +-
drivers/media/video/bttv-driver.c          |    2 +-
drivers/media/video/saa7134/saa7134-core.c |    2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

applies-to: f72516fc599b70f5507e6cf69b256b0da72b3646 fc3bbed930173e0784960f17cf67c229e652f6a0

drivers/media/radio/radio-gemtek-pci.c +1 -1
index 630cc78..78b2888 100644
@@ -394,7 +394,7 @@ static struct pci_driver gemtek_pci_driv
 
 static int __init gemtek_pci_init_module( void )
 {
-	return pci_module_init( &gemtek_pci_driver );
+	return pci_register_driver( &gemtek_pci_driver );
 }
 
 static void __exit gemtek_pci_cleanup_module( void )
drivers/media/radio/radio-maxiradio.c +1 -1
index 02d39a5..7b33d8f 100644
@@ -337,7 +337,7 @@ static struct pci_driver maxiradio_drive
 
 static int __init maxiradio_radio_init(void)
 {
-	return pci_module_init(&maxiradio_driver);
+	return pci_register_driver(&maxiradio_driver);
 }
 
 static void __exit maxiradio_radio_exit(void)
drivers/media/video/bttv-driver.c +1 -1
index 3c58a2a..cfb720d 100644
@@ -4253,7 +4253,7 @@ static int bttv_init_module(void)
 	bttv_check_chipset();
 
 	bus_register(&bttv_sub_bus_type);
-	return pci_module_init(&bttv_pci_driver);
+	return pci_register_driver(&bttv_pci_driver);
 }
 
 static void bttv_cleanup_module(void)
drivers/media/video/saa7134/saa7134-core.c +1 -2
index 1a093bf..18aa5d4 100644
@@ -1155,7 +1155,7 @@ static int saa7134_init(void)
 	printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n",
 	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
 #endif
-	return pci_module_init(&saa7134_pci_driver);
+	return pci_register_driver(&saa7134_pci_driver);
 }
 
 static void saa7134_fini(void)
---

0.99.9k

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#12 lore raw

Re: [PATCH 2/11] SCSI: replace all uses of pci_module_init with pci_register_driver

In reply to Otavio Salvador
Quoted 5 lines · Otavio Salvador

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

This has already been "done". On November 30th I sent in a patch-set for the same task.

Btw, I also sent a patch named "[PATCH] pci: Schedule removal of pci_module_init (was ..." today, about 17 hours ago. Would you mind check it, please?

cu
Richard Knutsson

author
#13 lore raw
In reply to Otavio Salvador

sound/oss/es1371.c static struct pci_driver es1371_driver =

Quoted 14 lines · Otavio Salvador
sound/oss/es1371.c +1 -1
index 12a56d5..f770df8 100644
@@ -94,7 +94,7 @@
  *    07.02.2000   0.24  Use pci_alloc_consistent and pci_register_driver
  *    07.02.2000   0.25  Use ac97_codec
  *    01.03.2000   0.26  SPDIF patch by Mikael Bouillot <[email protected]>
- *                       Use pci_module_init
+ *                       Use pci_register_driver
  *    21.11.2000   0.27  Initialize dma buffers in poll, otherwise poll may return a bogus mask
  *    12.12.2000   0.28  More dma buffer initializations, patch from
  *                       Tjeerd Mulder <[email protected]>

@@ -3090,7 +3090,7 @@ static struct pci_driver es1371_driver =

This hook shouldn't be applied. Sorry for that.

Signature · 8 lines
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: [email protected]      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
 you the whole house."
author
#14 lore raw

PATCH 1/1 Revert my comment change did in [PATCH] OSS: replace all uses of pci_module_init with pci_register_driver

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>

---

 sound/oss/es1371.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: fa7c34e6bdc9208dec681eb41707029371db3703 1518764e5ded4c388408da73c561e37fc28bf2ce

sound/oss/es1371.c +1 -1
index f770df8..5c697f1 100644
@@ -94,7 +94,7 @@
  *    07.02.2000   0.24  Use pci_alloc_consistent and pci_register_driver
  *    07.02.2000   0.25  Use ac97_codec
  *    01.03.2000   0.26  SPDIF patch by Mikael Bouillot <[email protected]>
- *                       Use pci_register_driver
+ *                       Use pci_module_init
  *    21.11.2000   0.27  Initialize dma buffers in poll, otherwise poll may return a bogus mask
  *    12.12.2000   0.28  More dma buffer initializations, patch from
  *                       Tjeerd Mulder <[email protected]>

---
0.99.9k

#15 lore raw
In reply to Otavio Salvador
Quoted 3 lines · Otavio Salvador

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Sorry, but Richard Knutsson <[email protected]> already did all of this last week. His patches are in the latest -mm release, and are in my queue too.

thanks,

greg k-h

author
#16 lore raw
Quoted 8 lines · Greg KH
Quoted 3 lines · Otavio Salvador

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Sorry, but Richard Knutsson <[email protected]> already did all of this last week. His patches are in the latest -mm release, and are in my queue too.

No problem. He did it on all source or just oss subsystem?

Signature · 8 lines
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: [email protected]      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
 you the whole house."
#17 lore raw
Quoted 7 lines · Otavio Salvador
Quoted 5 lines · Greg KH
Quoted 3 lines · Otavio Salvador

This patch replace all calls to pci_module_init, that's deprecated and will be removed in future, with pci_register_driver that should be the used function now.

Quoted 5 lines
Quoted 3 lines

Sorry, but Richard Knutsson <[email protected]> already did all of this last week. His patches are in the latest -mm release, and are in my queue too.

No problem. He did it on all source or just oss subsystem?

Look at the archives to be sure, but I'm pretty sure he did the whole kernel tree.

thanks,

greg k-h