PNP: adjust pnp_register_card_driver() signature
cover PNP: adjust pnp_register_card_driver() signature
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed. I recently changed the interface along with pnp_register_driver(), but forgot to update the callers of pnp_register_card_driver().
Several of these patches also fix unrelated __init/__devinit issues found by "make buildcheck". Most of these are for .probe() methods, so they shouldn't have caused any problems because I doubt there are any hot-pluggable PNP sound cards.
PATCH 1/12 PNP: adjust pnp_register_card_driver() signature
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed.
sound/isa/ad1816a/ad1816a.c +9 -3
@@ -262,6 +262,8 @@return 0 ; } +static unsigned int __devinitdata ad1816a_devices; +static int __devinit snd_ad1816a_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -275,6 +277,7 @@if (res <0 )return res; dev++; + ad1816a_devices++;return 0 ; }return -ENODEV ;
@@ -297,10 +300,13 @@static int __init alsa_card_ad1816a_init (void ) { -int cards; +int err; + + err =pnp_register_card_driver (&ad1816a_pnpc_driver); +if (err) +return err; - cards =pnp_register_card_driver (&ad1816a_pnpc_driver); -if (cards <=0 ) { +if (!ad1816a_devices) {pnp_unregister_card_driver (&ad1816a_pnpc_driver);#ifdef MODULE printk (KERN_ERR "no AD1816A based soundcards found.\n" );
PATCH 2/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix a __init/__devinit issue.
sound/isa/als100.c +10 -4
@@ -199,7 +199,7 @@return 0 ; } -static int __init snd_card_als100_probe (int dev, +static int __devinit snd_card_als100_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -281,6 +281,8 @@return 0 ; } +static unsigned int __devinitdata als100_devices; +static int __devinit snd_als100_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -294,6 +296,7 @@if (res <0 )return res; dev++; + als100_devices++;return 0 ; }return -ENODEV ;
@@ -345,10 +348,13 @@static int __init alsa_card_als100_init (void ) { -int cards; +int err; + + err =pnp_register_card_driver (&als100_pnpc_driver); +if (err) +return err; - cards =pnp_register_card_driver (&als100_pnpc_driver); -if (cards <=0 ) { +if (!als100_devices) {pnp_unregister_card_driver (&als100_pnpc_driver);#ifdef MODULE snd_printk (KERN_ERR "no ALS100 based soundcards found\n" );
PATCH 3/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed.
sound/isa/azt2320.c +9 -3
@@ -310,6 +310,8 @@return 0 ; } +static unsigned int __devinitdata azt2320_devices; +static int __devinit snd_azt2320_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -323,6 +325,7 @@if (res <0 )return res; dev++; + azt2320_devices++;return 0 ; }return -ENODEV ;
@@ -372,10 +375,13 @@static int __init alsa_card_azt2320_init (void ) { -int cards; +int err; + + err =pnp_register_card_driver (&azt2320_pnpc_driver); +if (err) +return err; - cards =pnp_register_card_driver (&azt2320_pnpc_driver); -if (cards <=0 ) { +if (!azt2320_devices) {pnp_unregister_card_driver (&azt2320_pnpc_driver);#ifdef MODULE snd_printk (KERN_ERR "no AZT2320 based soundcards found\n" );
PATCH 4/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/cmi8330.c +9 -6
@@ -175,7 +175,7 @@#endif -static struct ad1848_mix_elem snd_cmi8330_controls[]__initdata = { +static struct ad1848_mix_elem snd_cmi8330_controls[]__devinitdata = {AD1848_DOUBLE ("Master Playback Volume" ,0 ,CMI8330_MASTVOL ,CMI8330_MASTVOL ,4 ,0 ,15 ,0 ),AD1848_SINGLE ("Loud Playback Switch" ,0 ,CMI8330_MUTEMUX ,6 ,1 ,1 ),AD1848_DOUBLE ("PCM Playback Switch" ,0 ,AD1848_LEFT_OUTPUT ,AD1848_RIGHT_OUTPUT ,7 ,7 ,1 ,1 ),
@@ -204,7 +204,7 @@ };#ifdef ENABLE_SB_MIXER -static struct sbmix_elem cmi8330_sb_mixers[]__initdata = { +static struct sbmix_elem cmi8330_sb_mixers[]__devinitdata = {SB_DOUBLE ("SB Master Playback Volume" ,SB_DSP4_MASTER_DEV , (SB_DSP4_MASTER_DEV +1 ),3 ,3 ,31 ),SB_DOUBLE ("Tone Control - Bass" ,SB_DSP4_BASS_DEV , (SB_DSP4_BASS_DEV +1 ),4 ,4 ,15 ), SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
@@ -222,7 +222,7 @@ SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), }; -static unsigned char cmi8330_sb_init_values[][2 ]__initdata = { +static unsigned char cmi8330_sb_init_values[][2 ]__devinitdata = { {SB_DSP4_MASTER_DEV +0 ,0 }, {SB_DSP4_MASTER_DEV +1 ,0 }, {SB_DSP4_PCM_DEV +0 ,0 },
@@ -545,7 +545,7 @@return snd_card_register (card); } -static int __init snd_cmi8330_nonpnp_probe (struct platform_device *pdev) +static int __devinit snd_cmi8330_nonpnp_probe (struct platform_device *pdev) {struct snd_card *card;int err;
@@ -607,6 +607,8 @@#ifdef CONFIG_PNP +static unsigned int __devinitdata cmi8330_pnp_devices; +static int __devinit snd_cmi8330_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -636,6 +638,7 @@ }pnp_set_card_drvdata (pcard, card); dev++; + cmi8330_pnp_devices++;return 0 ; }
@@ -706,9 +709,9 @@#ifdef CONFIG_PNP err =pnp_register_card_driver (&cmi8330_pnpc_driver); -if (err >=0 ) { +if (!err) { pnp_registered =1 ; - cards += err; + cards += cmi8330_pnp_devices; }#endif
PATCH 5/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed.
sound/isa/dt019x.c +9 -3
@@ -272,6 +272,8 @@return 0 ; } +static unsigned int __devinitdata dt019x_devices; +static int __devinit snd_dt019x_pnp_probe (struct pnp_card_link *card,const struct pnp_card_device_id *pid) {
@@ -285,6 +287,7 @@if (res <0 )return res; dev++; + dt019x_devices++;return 0 ; }return -ENODEV ;
@@ -336,10 +339,13 @@static int __init alsa_card_dt019x_init (void ) { -int cards =0 ; +int err; + + err =pnp_register_card_driver (&dt019x_pnpc_driver); +if (err) +return err; - cards =pnp_register_card_driver (&dt019x_pnpc_driver); -if (cards <=0 ) { +if (!dt019x_devices) {pnp_unregister_card_driver (&dt019x_pnpc_driver);#ifdef MODULE snd_printk (KERN_ERR "no DT-019X / ALS-007 based soundcards found\n" );
PATCH 6/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/es18xx.c +8 -5
@@ -2203,7 +2203,7 @@return snd_card_register (card); } -static int __init snd_es18xx_nonpnp_probe1 (int dev,struct platform_device *devptr) +static int __devinit snd_es18xx_nonpnp_probe1 (int dev,struct platform_device *devptr) {struct snd_card *card;int err;
@@ -2220,7 +2220,7 @@return 0 ; } -static int __init snd_es18xx_nonpnp_probe (struct platform_device *pdev) +static int __devinit snd_es18xx_nonpnp_probe (struct platform_device *pdev) {int dev = pdev->id;int err;
@@ -2296,6 +2296,8 @@#ifdef CONFIG_PNP +static unsigned int __devinitdata es18xx_pnp_devices; +static int __devinit snd_audiodrive_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -2326,6 +2328,7 @@pnp_set_card_drvdata (pcard, card); dev++; + es18xx_pnp_devices++;return 0 ; }
@@ -2396,10 +2399,10 @@ }#ifdef CONFIG_PNP - i =pnp_register_card_driver (&es18xx_pnpc_driver); -if (i >=0 ) { + err =pnp_register_card_driver (&es18xx_pnpc_driver); +if (!err) { pnp_registered =1 ; - cards += i; + cards += es18xx_pnp_devices; }#endif
PATCH 7/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/sb/es968.c +9 -3
@@ -124,7 +124,7 @@return 0 ; } -static int __init snd_card_es968_probe (int dev, +static int __devinit snd_card_es968_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -182,6 +182,8 @@return 0 ; } +static unsigned int __devinitdata es968_devices; +static int __devinit snd_es968_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -195,6 +197,7 @@if (res <0 )return res; dev++; + es968_devices++;return 0 ; }return -ENODEV ;
@@ -246,8 +249,11 @@static int __init alsa_card_es968_init (void ) { -int cards =pnp_register_card_driver (&es968_pnpc_driver); -if (cards <=0 ) { +int err =pnp_register_card_driver (&es968_pnpc_driver); +if (err) +return err; + +if (!es968_devices) {pnp_unregister_card_driver (&es968_pnpc_driver);#ifdef MODULE snd_printk (KERN_ERR "no ES968 based soundcards found\n" );
PATCH 8/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/gus/interwave.c +7 -5
@@ -791,7 +791,7 @@return 0 ; } -static int __init snd_interwave_nonpnp_probe1 (int dev,struct platform_device *devptr) +static int __devinit snd_interwave_nonpnp_probe1 (int dev,struct platform_device *devptr) {struct snd_card *card;int err;
@@ -809,7 +809,7 @@return 0 ; } -static int __init snd_interwave_nonpnp_probe (struct platform_device *pdev) +static int __devinit snd_interwave_nonpnp_probe (struct platform_device *pdev) {int dev = pdev->id;int err;
@@ -867,6 +867,7 @@ };#ifdef CONFIG_PNP +static unsigned int __devinitdata interwave_pnp_devices;static int __devinit snd_interwave_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid)
@@ -897,6 +898,7 @@ }pnp_set_card_drvdata (pcard, card); dev++; + interwave_pnp_devices++;return 0 ; }
@@ -954,10 +956,10 @@ }/* ISA PnP cards */ - i =pnp_register_card_driver (&interwave_pnpc_driver); -if (i >=0 ) { + err =pnp_register_card_driver (&interwave_pnpc_driver); +if (!err) { pnp_registered =1 ; - cards += i; + cards += interwave_pnp_devices;; }if (!cards) {
PATCH 9/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/sb/sb16.c +8 -6
@@ -369,7 +369,7 @@return card; } -static int __init snd_sb16_probe (struct snd_card *card,int dev) +static int __devinit snd_sb16_probe (struct snd_card *card,int dev) {int xirq, xdma8, xdma16;struct snd_sb *chip;
@@ -518,7 +518,7 @@ }#endif -static int __init snd_sb16_nonpnp_probe1 (int dev,struct platform_device *devptr) +static int __devinit snd_sb16_nonpnp_probe1 (int dev,struct platform_device *devptr) {struct snd_card_sb16 *acard;struct snd_card *card;
@@ -548,7 +548,7 @@ } -static int __init snd_sb16_nonpnp_probe (struct platform_device *pdev) +static int __devinit snd_sb16_nonpnp_probe (struct platform_device *pdev) {int dev = pdev->id;int err;
@@ -629,6 +629,7 @@#ifdef CONFIG_PNP +static unsigned int __devinitdata sb16_pnp_devices;static int __devinit snd_sb16_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid)
@@ -651,6 +652,7 @@ }pnp_set_card_drvdata (pcard, card); dev++; + sb16_pnp_devices++;return 0 ; }
@@ -727,10 +729,10 @@ }#ifdef CONFIG_PNP /* PnP cards at last */ - i =pnp_register_card_driver (&sb16_pnpc_driver); -if (i >=0 ) { + err =pnp_register_card_driver (&sb16_pnpc_driver); +if (!err) { pnp_registered =1 ; - cards += i; + cards += sb16_pnp_devices; }#endif
PATCH 10/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/oss/sb_card.c +20 -9
@@ -52,6 +52,7 @@static struct sb_card_config *legacy =NULL ;#ifdef CONFIG_PNP +static int pnp_registered;static int __initdata pnp =1 ;/* static int __initdata uart401 = 0;
@@ -133,7 +134,7 @@ }/* Register legacy card with OSS subsystem */ -static int sb_init_legacy (void ) +static int __init sb_init_legacy (void ) {struct sb_module_options sbmo = {0 };
@@ -234,6 +235,8 @@ } } +static unsigned int sb_pnp_devices; +/* Probe callback function for the PnP API */ static int sb_pnp_probe (struct pnp_card_link *card,const struct pnp_card_device_id *card_id) {
@@ -264,6 +267,7 @@ scc->conf.dma, scc->conf.dma2);pnp_set_card_drvdata (card, scc); + sb_pnp_devices++;return sb_register_oss (scc, &sbmo); }
@@ -289,6 +293,14 @@MODULE_DEVICE_TABLE (pnp_card, sb_pnp_card_table);#endif /* CONFIG_PNP */ +static void __init_or_module sb_unregister_all(void) +{ +#ifdef CONFIG_PNP +if (pnp_registered) +pnp_unregister_card_driver (&sb_pnp_driver); +#endif +} +static int __init sb_init (void ) {int lres =0 ;
@@ -307,17 +319,18 @@#ifdef CONFIG_PNP if (pnp) { - pres =pnp_register_card_driver (&sb_pnp_driver); +int err =pnp_register_card_driver (&sb_pnp_driver); +if (!err) + pnp_registered =1 ; + pres = sb_pnp_devices; }#endif printk (KERN_INFO "sb: Init: Done\n" );/* If either PnP or Legacy registered a card then return * success */ -if (pres <=0 && lres <=0 ) { -#ifdef CONFIG_PNP -pnp_unregister_card_driver (&sb_pnp_driver); -#endif +if (pres ==0 && lres <=0 ) { +sb_unregister_all ();return -ENODEV ; }return 0 ;
@@ -333,9 +346,7 @@sb_unload (legacy); } -#ifdef CONFIG_PNP -pnp_unregister_card_driver (&sb_pnp_driver); -#endif +sb_unregister_all ();vfree (smw_free); smw_free =NULL ;
PATCH 11/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed.
sound/isa/sscape.c +2 -2
@@ -1255,7 +1255,7 @@ } -static int __init snd_sscape_probe (struct platform_device *pdev) +static int __devinit snd_sscape_probe (struct platform_device *pdev) {int dev = pdev->id;struct snd_card *card;
@@ -1469,7 +1469,7 @@if (ret <0 )return ret;#ifdef CONFIG_PNP -if (pnp_register_card_driver (&sscape_pnpc_driver) >=0 ) +if (pnp_register_card_driver (&sscape_pnpc_driver) ==0 ) pnp_registered =1 ;#endif return 0 ;
PATCH 12/12 PNP: adjust pnp_register_card_driver() signature
In reply to Bjorn HelgaasRemove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
sound/isa/wavefront/wavefront.c +6 -4
@@ -589,7 +589,7 @@return snd_card_register (card); } -static int __init snd_wavefront_nonpnp_probe (struct platform_device *pdev) +static int __devinit snd_wavefront_nonpnp_probe (struct platform_device *pdev) {int dev = pdev->id;struct snd_card *card;
@@ -637,6 +637,7 @@#ifdef CONFIG_PNP +static unsigned int __devinitdata wavefront_pnp_devices;static int __devinit snd_wavefront_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid)
@@ -670,6 +671,7 @@pnp_set_card_drvdata (pcard, card); dev++; + wavefront_pnp_devices++;return 0 ; }
@@ -729,10 +731,10 @@ }#ifdef CONFIG_PNP - i =pnp_register_card_driver (&wavefront_pnpc_driver); -if (i >=0 ) { + err =pnp_register_card_driver (&wavefront_pnpc_driver); +if (!err) { pnp_registered =1 ; - cards += i; + cards += wavefront_pnp_devices; }#endif