Skip to contentSkip to conversation

cleanup pci init routines

PATCH In review Jeff Muizelaar 2 participants 2 messages Mar 21, 2004 – Apr 13, 2004 Documentation

lore
Share & tools
lore

Jeff Muizelaar

author
#0 lore raw

PATCH 1/1 cleanup pci init routines

the attached patch basically does this for the pci drivers in alsa-kernel

static int __init alsa_card_mychip_init(void)
{
- int err;
-
- if ((err = pci_module_init(&driver)) < 0) {
- #ifdef MODULE
- printk(KERN_ERR "My chip soundcard not found "
- "or device busy\n");
- #endif
- return err;

-          }
-          return 0;
+          return pci_module_init(&driver);

}

the added message does not really give any additional information. The patch also improves the consistency with the majority of the drivers in the kernel that just use return pci_module_init(&driver); with out giving any message.

-Jeff

Documentation/DocBook/writing-an-alsa-driver.tmpl +2 -20
diff -ur alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl alsa-kernel-mod-init/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -1355,16 +1355,7 @@
   // initialization of the module
   static int __init alsa_card_mychip_init(void)
   {
-          int err;
-
-          if ((err = pci_module_init(&driver)) < 0) {
-  #ifdef MODULE
-                  printk(KERN_ERR "My chip soundcard not found "
-                                  "or device busy\n");
-  #endif
-                  return err;
-          }
-          return 0;
+          return pci_module_init(&driver);
   }
 
   // clean up the module

@@ -1781,16 +1772,7 @@
 <![CDATA[
   static int __init alsa_card_mychip_init(void)
   {
-          int err;
-
-          if ((err = pci_module_init(&driver)) < 0) {
-  #ifdef MODULE
-                  printk(KERN_ERR "My chip soundcard not found"
-                                  " or device busy\n");
-  #endif
-                  return err;
-          }
-          return 0;
+          return pci_module_init(&driver);
   }
 
   static void __exit alsa_card_mychip_exit(void)
pci/ali5451/ali5451.c +1 -9
diff -ur alsa-kernel/pci/ali5451/ali5451.c alsa-kernel-mod-init/pci/ali5451/ali5451.c
@@ -2289,15 +2289,7 @@
 
 static int __init alsa_card_ali_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ALi pci audio not found or device busy.\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_ali_exit(void)
pci/als4000.c +1 -9
diff -ur alsa-kernel/pci/als4000.c alsa-kernel-mod-init/pci/als4000.c
@@ -755,15 +755,7 @@
 
 static int __init alsa_card_als4000_init(void)
 {
-	int err;
-	
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "no ALS4000 based soundcards found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_als4000_exit(void)
pci/atiixp.c +1 -10
diff -ur alsa-kernel/pci/atiixp.c alsa-kernel-mod-init/pci/atiixp.c
@@ -1524,16 +1524,7 @@
 
 static int __init alsa_card_atiixp_init(void)
 {
-	int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ATI IXP AC97 controller not found or device busy\n");
-#endif
-                return err;
-        }
-
-        return 0;
+        return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_atiixp_exit(void)
pci/au88x0/au88x0.c +1 -10
diff -ur alsa-kernel/pci/au88x0/au88x0.c alsa-kernel-mod-init/pci/au88x0/au88x0.c
@@ -403,16 +403,7 @@
 // initialization of the module
 static int __init alsa_card_vortex_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Aureal soundcard not found "
-		       "or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 // clean up the module
pci/azt3328.c +3 -10
diff -ur alsa-kernel/pci/azt3328.c alsa-kernel-mod-init/pci/azt3328.c
@@ -1573,18 +1573,11 @@
 static int __init alsa_card_azf3328_init(void)
 {
 	int err;
-	
-	snd_azf3328_dbgcallenter();
 
-	if ((err = pci_module_init(&driver)) < 0)
-	{
-#ifdef MODULE
-		printk(KERN_ERR "azt3328: no AZF3328 based soundcards found or device busy\n");
-#endif
-		return err;
-	}
+	snd_azf3328_dbgcallenter();
+	err = pci_module_init(&driver);
 	snd_azf3328_dbgcallleave();
-	return 0;
+	return err;
 }
 
 static void __exit alsa_card_azf3328_exit(void)
pci/bt87x.c +1 -10
diff -ur alsa-kernel/pci/bt87x.c alsa-kernel-mod-init/pci/bt87x.c
@@ -851,16 +851,7 @@
 
 static int __init alsa_card_bt87x_init(void)
 {
-	int err;
-
-	err = pci_module_init(&driver);
-	if (err < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Bt87x soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_bt87x_exit(void)
pci/cmipci.c +1 -9
diff -ur alsa-kernel/pci/cmipci.c alsa-kernel-mod-init/pci/cmipci.c
@@ -3264,15 +3264,7 @@
 	
 static int __init alsa_card_cmipci_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "C-Media PCI soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_cmipci_exit(void)
pci/cs4281.c +1 -9
diff -ur alsa-kernel/pci/cs4281.c alsa-kernel-mod-init/pci/cs4281.c
@@ -2160,15 +2160,7 @@
 	
 static int __init alsa_card_cs4281_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "CS4281 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_cs4281_exit(void)
pci/cs46xx/cs46xx.c +1 -9
diff -ur alsa-kernel/pci/cs46xx/cs46xx.c alsa-kernel-mod-init/pci/cs46xx/cs46xx.c
@@ -198,15 +198,7 @@
 
 static int __init alsa_card_cs46xx_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Sound Fusion CS46xx soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_cs46xx_exit(void)
pci/emu10k1/emu10k1.c +1 -9
diff -ur alsa-kernel/pci/emu10k1/emu10k1.c alsa-kernel-mod-init/pci/emu10k1/emu10k1.c
@@ -211,15 +211,7 @@
 
 static int __init alsa_card_emu10k1_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "EMU10K1/Audigy soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_emu10k1_exit(void)
pci/ens1370.c +2 -10
diff -ur alsa-kernel/pci/ens1370.c alsa-kernel-mod-init/pci/ens1370.c
@@ -2368,18 +2368,10 @@
 	.probe = snd_audiopci_probe,
 	.remove = __devexit_p(snd_audiopci_remove),
 };
-	
+
 static int __init alsa_card_ens137x_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Ensoniq AudioPCI soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_ens137x_exit(void)
pci/es1938.c +1 -9
diff -ur alsa-kernel/pci/es1938.c alsa-kernel-mod-init/pci/es1938.c
@@ -1700,15 +1700,7 @@
 
 static int __init alsa_card_es1938_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ESS Solo-1 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_es1938_exit(void)
pci/es1968.c +1 -9
diff -ur alsa-kernel/pci/es1968.c alsa-kernel-mod-init/pci/es1968.c
@@ -2789,15 +2789,7 @@
 
 static int __init alsa_card_es1968_init(void)
 {
-	int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ESS Maestro soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+        return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_es1968_exit(void)
pci/fm801.c +1 -9
diff -ur alsa-kernel/pci/fm801.c alsa-kernel-mod-init/pci/fm801.c
@@ -1482,15 +1482,7 @@
 
 static int __init alsa_card_fm801_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ForteMedia FM801 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_fm801_exit(void)
pci/ice1712/ice1712.c +1 -9
diff -ur alsa-kernel/pci/ice1712/ice1712.c alsa-kernel-mod-init/pci/ice1712/ice1712.c
@@ -2661,15 +2661,7 @@
 
 static int __init alsa_card_ice1712_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ICE1712 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_ice1712_exit(void)
pci/ice1712/ice1724.c +1 -9
diff -ur alsa-kernel/pci/ice1712/ice1724.c alsa-kernel-mod-init/pci/ice1712/ice1724.c
@@ -2141,15 +2141,7 @@
 
 static int __init alsa_card_ice1724_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "ICE1724 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_ice1724_exit(void)
pci/intel8x0.c +0 -3
diff -ur alsa-kernel/pci/intel8x0.c alsa-kernel-mod-init/pci/intel8x0.c
@@ -2816,9 +2816,6 @@
 	int err;
 
         if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Intel ICH soundcard not found or device busy\n");
-#endif
                 return err;
         }
 #if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
pci/intel8x0m.c +1 -10
diff -ur alsa-kernel/pci/intel8x0m.c alsa-kernel-mod-init/pci/intel8x0m.c
@@ -1463,16 +1463,7 @@
 
 static int __init alsa_card_intel8x0m_init(void)
 {
-	int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Intel ICH modemcard not found or device busy\n");
-#endif
-                return err;
-        }
-
-        return 0;
+        return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_intel8x0m_exit(void)
pci/korg1212/korg1212.c +1 -9
diff -ur alsa-kernel/pci/korg1212/korg1212.c alsa-kernel-mod-init/pci/korg1212/korg1212.c
@@ -2525,15 +2525,7 @@
 
 static int __init alsa_card_korg1212_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "No Korg 1212IO cards found\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_korg1212_exit(void)
pci/maestro3.c +2 -10
diff -ur alsa-kernel/pci/maestro3.c alsa-kernel-mod-init/pci/maestro3.c
@@ -2761,18 +2761,10 @@
 	.resume = snd_m3_resume,
 #endif
 };
-	
+
 static int __init alsa_card_m3_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Maestro3/Allegro soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_m3_exit(void)
pci/mixart/mixart.c +1 -9
diff -ur alsa-kernel/pci/mixart/mixart.c alsa-kernel-mod-init/pci/mixart/mixart.c
@@ -1432,15 +1432,7 @@
 
 static int __init alsa_card_mixart_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		snd_printk(KERN_ERR "Digigram miXart soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_mixart_exit(void)
pci/nm256/nm256.c +1 -8
diff -ur alsa-kernel/pci/nm256/nm256.c alsa-kernel-mod-init/pci/nm256/nm256.c
@@ -1669,14 +1669,7 @@
 
 static int __init alsa_card_nm256_init(void)
 {
-	int err;
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "NeoMagic 256 audio soundchip not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_nm256_exit(void)
pci/rme32.c +1 -9
diff -ur alsa-kernel/pci/rme32.c alsa-kernel-mod-init/pci/rme32.c
@@ -1995,15 +1995,7 @@
 
 static int __init alsa_card_rme32_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		snd_printk("No RME Digi32 cards found\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_rme32_exit(void)
pci/rme9652/hdsp.c +1 -8
diff -ur alsa-kernel/pci/rme9652/hdsp.c alsa-kernel-mod-init/pci/rme9652/hdsp.c
@@ -5198,14 +5198,7 @@
 
 static int __init alsa_card_hdsp_init(void)
 {
-	if (pci_module_init(&driver) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "RME Hammerfall-DSP: no cards found\n");
-#endif
-		return -ENODEV;
-	}
-
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_hdsp_exit(void)
pci/rme9652/rme9652.c +1 -8
diff -ur alsa-kernel/pci/rme9652/rme9652.c alsa-kernel-mod-init/pci/rme9652/rme9652.c
@@ -2748,14 +2748,7 @@
 
 static int __init alsa_card_hammerfall_init(void)
 {
-	if (pci_module_init(&driver) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "RME Digi9652/Digi9636: no cards found\n");
-#endif
-		return -ENODEV;
-	}
-
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_hammerfall_exit(void)
pci/sonicvibes.c +1 -9
diff -ur alsa-kernel/pci/sonicvibes.c alsa-kernel-mod-init/pci/sonicvibes.c
@@ -1535,15 +1535,7 @@
 
 static int __init alsa_card_sonicvibes_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "S3 SonicVibes soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_sonicvibes_exit(void)
pci/trident/trident.c +1 -9
diff -ur alsa-kernel/pci/trident/trident.c alsa-kernel-mod-init/pci/trident/trident.c
@@ -210,15 +210,7 @@
 
 static int __init alsa_card_trident_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Trident 4DWave PCI soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_trident_exit(void)
pci/via82xx.c +1 -9
diff -ur alsa-kernel/pci/via82xx.c alsa-kernel-mod-init/pci/via82xx.c
@@ -2182,15 +2182,7 @@
 
 static int __init alsa_card_via82xx_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "VIA 82xx soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_via82xx_exit(void)
pci/vx222/vx222.c +1 -9
diff -ur alsa-kernel/pci/vx222/vx222.c alsa-kernel-mod-init/pci/vx222/vx222.c
@@ -272,15 +272,7 @@
 
 static int __init alsa_card_vx222_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Digigram VX222 soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_vx222_exit(void)
pci/ymfpci/ymfpci.c +1 -9
diff -ur alsa-kernel/pci/ymfpci/ymfpci.c alsa-kernel-mod-init/pci/ymfpci/ymfpci.c
@@ -352,15 +352,7 @@
 
 static int __init alsa_card_ymfpci_init(void)
 {
-	int err;
-
-	if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-		printk(KERN_ERR "Yamaha DS-XG PCI soundcard not found or device busy\n");
-#endif
-		return err;
-	}
-	return 0;
+	return pci_module_init(&driver);
 }
 
 static void __exit alsa_card_ymfpci_exit(void)
#1 lore raw

Hi,

thanks for the patch. i applied it to CVS. the message doesn't make sense on 2.6 kernels at all...
(sorry for the delay, i've had no time for ALSA for these weeks.)

ciao,

Takashi

At Sat, 20 Mar 2004 21:15:41 -0500,

Quoted 2 lines · Jeff Muizelaar

the attached patch basically does this for the pci drivers in alsa-kernel

-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click