Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 654aa661 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] gus - Use platform_device 



Rewrite the probe/remove with platform_device.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2a571ed1

sound/isa/gus/gusclassic.c

+70 −46
Original line number Diff line number Diff line
@@ -20,14 +20,15 @@ 
 */



#include <sound/driver.h>

#include <asm/dma.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/time.h>

#include <linux/moduleparam.h>

#include <asm/dma.h>

#include <sound/core.h>

#include <sound/gus.h>

#define SNDRV_LEGACY_AUTO_PROBE

#define SNDRV_LEGACY_FIND_FREE_IRQ

#define SNDRV_LEGACY_FIND_FREE_DMA

#include <sound/initval.h>
@@ -70,7 +71,6 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Classic driver."); 
module_param_array(pcm_channels, int, NULL, 0444);

MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Classic driver.");



static struct snd_card *snd_gusclassic_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;



#define PFX	"gusclassic: "
@@ -101,20 +101,19 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) 
	gus->joystick_dac = joystick_dac[dev];

}



static int __init snd_gusclassic_probe(int dev)

static int __init snd_gusclassic_probe(struct platform_device *pdev)

{

	int dev = pdev->id;

	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};

	static int possible_dmas[] = {5, 6, 7, 1, 3, -1};

	int xirq, xdma1, xdma2;

	struct snd_card *card;

	struct snd_gusclassic *guscard;

	struct snd_gus_card *gus = NULL;

	int err;



	card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);

	if (card == NULL)

		return -ENOMEM;

	guscard = (struct snd_gusclassic *)card->private_data;

	if (pcm_channels[dev] < 2)

		pcm_channels[dev] = 2;
@@ -143,12 +142,31 @@ static int __init snd_gusclassic_probe(int dev) 
		}

	}





	if ((err = snd_gus_create(card,

	if (port[dev] != SNDRV_AUTO_PORT) {

		err = snd_gus_create(card,

				     port[dev],

				     xirq, xdma1, xdma2,

				     0, channels[dev], pcm_channels[dev],

			          0, &gus)) < 0)

				     0, &gus);

	} else {

		/* auto-probe legacy ports */

		static unsigned long possible_ports[] = {

			0x220, 0x230, 0x240, 0x250, 0x260,

		};

		int i;

		for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {

			err = snd_gus_create(card,

					     possible_ports[i],

					     xirq, xdma1, xdma2,

					     0, channels[dev], pcm_channels[dev],

					     0, &gus);

			if (err >= 0) {

				port[dev] = possible_ports[i];

				break;

			}

		}

	}

	if (err < 0)

		goto _err;



	if ((err = snd_gusclassic_detect(gus)) < 0)
@@ -178,13 +196,12 @@ static int __init snd_gusclassic_probe(int dev) 
	if (dma2 >= 0)

		sprintf(card->longname + strlen(card->longname), "&%d", xdma2);



	if ((err = snd_card_set_generic_dev(card)) < 0)

		goto _err;

	snd_card_set_dev(card, &pdev->dev);



	if ((err = snd_card_register(card)) < 0)

		goto _err;



	snd_gusclassic_cards[dev] = card;

	platform_set_drvdata(pdev, card);

	return 0;



 _err:
@@ -192,53 +209,60 @@ static int __init snd_gusclassic_probe(int dev) 
	return err;

}



static int __init snd_gusclassic_legacy_auto_probe(unsigned long xport)

static int snd_gusclassic_remove(struct platform_device *devptr)

{

	static int dev;

	int res;



	for ( ; dev < SNDRV_CARDS; dev++) {

		if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)

			continue;

		port[dev] = xport;

		res = snd_gusclassic_probe(dev);

		if (res < 0)

			port[dev] = SNDRV_AUTO_PORT;

		return res;

	}

	return -ENODEV;

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);

	return 0;

}



#define GUSCLASSIC_DRIVER	"snd_gusclassic"



static struct platform_driver snd_gusclassic_driver = {

	.probe		= snd_gusclassic_probe,

	.remove		= snd_gusclassic_remove,

	/* FIXME: suspend/resume */

	.driver		= {

		.name	= GUSCLASSIC_DRIVER

	},

};



static int __init alsa_card_gusclassic_init(void)

{

	static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260, -1};

	int dev, cards, i;

	int i, cards, err;



	err = platform_driver_register(&snd_gusclassic_driver);

	if (err < 0)

		return err;



	for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {

		if (port[dev] == SNDRV_AUTO_PORT)

			continue;

		if (snd_gusclassic_probe(dev) >= 0)

	cards = 0;

	for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {

		struct platform_device *device;

		device = platform_device_register_simple(GUSCLASSIC_DRIVER,

							 i, NULL, 0);

		if (IS_ERR(device)) {

			err = PTR_ERR(device);

			goto errout;

		}

		cards++;

	}

	i = snd_legacy_auto_probe(possible_ports, snd_gusclassic_legacy_auto_probe);

	if (i > 0)

		cards += i;



	if (!cards) {

#ifdef MODULE

		printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");

#endif

		return -ENODEV;

		err = -ENODEV;

		goto errout;

	}

	return 0;



 errout:

	platform_driver_unregister(&snd_gusclassic_driver);

	return err;

}



static void __exit alsa_card_gusclassic_exit(void)

{

	int idx;

	

	for (idx = 0; idx < SNDRV_CARDS; idx++)

		snd_card_free(snd_gusclassic_cards[idx]);

	platform_driver_unregister(&snd_gusclassic_driver);

}



module_init(alsa_card_gusclassic_init)

sound/isa/gus/gusextreme.c

+67 −49
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ 
 */



#include <sound/driver.h>

#include <asm/dma.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/time.h>

#include <linux/moduleparam.h>

#include <asm/dma.h>

#include <sound/core.h>

#include <sound/gus.h>

#include <sound/es1688.h>
@@ -85,7 +87,6 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Extreme driver."); 
module_param_array(pcm_channels, int, NULL, 0444);

MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver.");



static struct snd_card *snd_gusextreme_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;



#define PFX	"gusextreme: "
@@ -166,15 +167,15 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) 
	return 0;

}



static int __init snd_gusextreme_probe(int dev)

static int __init snd_gusextreme_probe(struct platform_device *pdev)

{

	int dev = pdev->id;

	static int possible_ess_irqs[] = {5, 9, 10, 7, -1};

	static int possible_ess_dmas[] = {1, 3, 0, -1};

	static int possible_gf1_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};

	static int possible_gf1_dmas[] = {5, 6, 7, 1, 3, -1};

	int xgf1_irq, xgf1_dma, xess_irq, xmpu_irq, xess_dma;

	struct snd_card *card;

	struct snd_gusextreme *acard;

	struct snd_gus_card *gus;

	struct snd_es1688 *es1688;

	struct snd_opl3 *opl3;
@@ -183,7 +184,6 @@ static int __init snd_gusextreme_probe(int dev) 
	card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);

	if (card == NULL)

		return -ENOMEM;

	acard = (struct snd_gusextreme *)card->private_data;



	xgf1_irq = gf1_irq[dev];

	if (xgf1_irq == SNDRV_AUTO_IRQ) {
@@ -223,10 +223,29 @@ static int __init snd_gusextreme_probe(int dev) 
		}

	}



	if ((err = snd_es1688_create(card, port[dev], mpu_port[dev],

	if (port[dev] != SNDRV_AUTO_PORT) {

		err = snd_es1688_create(card, port[dev], mpu_port[dev],

					xess_irq, xmpu_irq, xess_dma,

					ES1688_HW_1688, &es1688);

	} else {

		/* auto-probe legacy ports */

		static unsigned long possible_ports[] = {0x220, 0x240, 0x260};

		int i;

		for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {

			err = snd_es1688_create(card,

						possible_ports[i],

						mpu_port[dev],

						xess_irq, xmpu_irq, xess_dma,

				     ES1688_HW_1688, &es1688)) < 0)

						ES1688_HW_1688, &es1688);

			if (err >= 0) {

				port[dev] = possible_ports[i];

				break;

			}

		}

	}

	if (err < 0)

		goto out;



	if (gf1_port[dev] < 0)

		gf1_port[dev] = port[dev] + 0x20;

	if ((err = snd_gus_create(card,
@@ -287,13 +306,12 @@ static int __init snd_gusextreme_probe(int dev) 
	sprintf(card->longname, "Gravis UltraSound Extreme at 0x%lx, irq %i&%i, dma %i&%i",

		es1688->port, xgf1_irq, xess_irq, xgf1_dma, xess_dma);



	if ((err = snd_card_set_generic_dev(card)) < 0)

		goto out;

	snd_card_set_dev(card, &pdev->dev);



	if ((err = snd_card_register(card)) < 0)

		goto out;



	snd_gusextreme_cards[dev] = card;

	platform_set_drvdata(pdev, card);

	return 0;



      out:
@@ -301,60 +319,60 @@ static int __init snd_gusextreme_probe(int dev) 
	return err;

}



static int __init snd_gusextreme_legacy_auto_probe(unsigned long xport)

static int snd_gusextreme_remove(struct platform_device *devptr)

{

        static int dev;

        int res;



        for ( ; dev < SNDRV_CARDS; dev++) {

                if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)

                        continue;

                port[dev] = xport;

                res = snd_gusextreme_probe(dev);

                if (res < 0)

                        port[dev] = SNDRV_AUTO_PORT;

                return res;

        }

        return -ENODEV;

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);

	return 0;

}



#define GUSEXTREME_DRIVER	"snd_gusextreme"



static struct platform_driver snd_gusextreme_driver = {

	.probe		= snd_gusextreme_probe,

	.remove		= snd_gusextreme_remove,

	/* FIXME: suspend/resume */

	.driver		= {

		.name	= GUSEXTREME_DRIVER

	},

};



static int __init alsa_card_gusextreme_init(void)

{

	static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};

	int dev, cards, i;

	int i, cards, err;



	err = platform_driver_register(&snd_gusextreme_driver);

	if (err < 0)

		return err;



	for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev] > 0; dev++) {

		if (port[dev] == SNDRV_AUTO_PORT)

			continue;

		if (snd_gusextreme_probe(dev) >= 0)

	cards = 0;

	for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {

		struct platform_device *device;

		device = platform_device_register_simple(GUSEXTREME_DRIVER,

							 i, NULL, 0);

		if (IS_ERR(device)) {

			err = PTR_ERR(device);

			goto errout;

		}

		cards++;

	}

	i = snd_legacy_auto_probe(possible_ports, snd_gusextreme_legacy_auto_probe);

	if (i > 0)

		cards += i;



	if (!cards) {

#ifdef MODULE

		printk(KERN_ERR "GUS Extreme soundcard not found or device busy\n");

#endif

		return -ENODEV;

		err = -ENODEV;

		goto errout;

	}

	return 0;



 errout:

	platform_driver_unregister(&snd_gusextreme_driver);

	return err;

}



static void __exit alsa_card_gusextreme_exit(void)

{

	int idx;

	struct snd_card *card;

	struct snd_gusextreme *acard;



	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		card = snd_gusextreme_cards[idx];

		if (card == NULL)

			continue;

		acard = (struct snd_gusextreme *)card->private_data;

		snd_card_free(snd_gusextreme_cards[idx]);

	}

	platform_driver_unregister(&snd_gusextreme_driver);

}



module_init(alsa_card_gusextreme_init)

sound/isa/gus/gusmax.c

+72 −45
Original line number Diff line number Diff line
@@ -20,15 +20,16 @@ 
 */



#include <sound/driver.h>

#include <asm/dma.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/time.h>

#include <linux/moduleparam.h>

#include <asm/dma.h>

#include <sound/core.h>

#include <sound/gus.h>

#include <sound/cs4231.h>

#define SNDRV_LEGACY_AUTO_PROBE

#define SNDRV_LEGACY_FIND_FREE_IRQ

#define SNDRV_LEGACY_FIND_FREE_DMA

#include <sound/initval.h>
@@ -80,8 +81,6 @@ struct snd_gusmax { 
	unsigned short pcm_status_reg;

};



static struct snd_card *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;



#define PFX	"gusmax: "



static int __init snd_gusmax_detect(struct snd_gus_card * gus)
@@ -203,8 +202,9 @@ static void snd_gusmax_free(struct snd_card *card) 
		free_irq(maxcard->irq, (void *)maxcard);

}



static int __init snd_gusmax_probe(int dev)

static int __init snd_gusmax_probe(struct platform_device *pdev)

{

	int dev = pdev->id;

	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};

	static int possible_dmas[] = {5, 6, 7, 1, 3, -1};

	int xirq, xdma1, xdma2, err;
@@ -247,12 +247,32 @@ static int __init snd_gusmax_probe(int dev) 
		}

	}



	if ((err = snd_gus_create(card,

	if (port[dev] != SNDRV_AUTO_PORT) {

		err = snd_gus_create(card,

				     port[dev],

				     -xirq, xdma1, xdma2,

				     0, channels[dev],

				     pcm_channels[dev],

				  0, &gus)) < 0)

				     0, &gus);

	} else {

		static unsigned long possible_ports[] = {

			0x220, 0x230, 0x240, 0x250, 0x260

		};

		int i;

		for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {

			err = snd_gus_create(card,

					     possible_ports[i],

					     -xirq, xdma1, xdma2,

					     0, channels[dev],

					     pcm_channels[dev],

					     0, &gus);

			if (err >= 0) {

				port[dev] = possible_ports[i];

				break;

			}

		}

	}

	if (err < 0)

		goto _err;



	if ((err = snd_gusmax_detect(gus)) < 0)
@@ -310,15 +330,15 @@ static int __init snd_gusmax_probe(int dev) 
	if (xdma2 >= 0)

		sprintf(card->longname + strlen(card->longname), "&%i", xdma2);



	if ((err = snd_card_set_generic_dev(card)) < 0)

		goto _err;

	snd_card_set_dev(card, &pdev->dev);



	if ((err = snd_card_register(card)) < 0)

		goto _err;

		

	maxcard->gus = gus;

	maxcard->cs4231 = cs4231;

	snd_gusmax_cards[dev] = card;



	platform_set_drvdata(pdev, card);

	return 0;



 _err:
@@ -326,53 +346,60 @@ static int __init snd_gusmax_probe(int dev) 
	return err;

}



static int __init snd_gusmax_legacy_auto_probe(unsigned long xport)

static int snd_gusmax_remove(struct platform_device *devptr)

{

	static int dev;

	int res;



	for ( ; dev < SNDRV_CARDS; dev++) {

		if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)

			continue;

		port[dev] = xport;

		res = snd_gusmax_probe(dev);

		if (res < 0)

			port[dev] = SNDRV_AUTO_PORT;

		return res;

	}

	return -ENODEV;

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);

	return 0;

}



#define GUSMAX_DRIVER	"snd_gusmax"



static struct platform_driver snd_gusmax_driver = {

	.probe		= snd_gusmax_probe,

	.remove		= snd_gusmax_remove,

	/* FIXME: suspend/resume */

	.driver		= {

		.name	= GUSMAX_DRIVER

	},

};



static int __init alsa_card_gusmax_init(void)

{

	static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260, -1};

	int dev, cards, i;

	int i, cards, err;



	for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev] > 0; dev++) {

		if (port[dev] == SNDRV_AUTO_PORT)

			continue;

		if (snd_gusmax_probe(dev) >= 0)

	err = platform_driver_register(&snd_gusmax_driver);

	if (err < 0)

		return err;



	cards = 0;

	for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {

		struct platform_device *device;

		device = platform_device_register_simple(GUSMAX_DRIVER,

							 i, NULL, 0);

		if (IS_ERR(device)) {

			err = PTR_ERR(device);

			goto errout;

		}

		cards++;

	}

	i = snd_legacy_auto_probe(possible_ports, snd_gusmax_legacy_auto_probe);

	if (i > 0)

		cards += i;



	if (!cards) {

#ifdef MODULE

		printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");

#endif

		return -ENODEV;

		err = -ENODEV;

		goto errout;

	}

	return 0;



 errout:

	platform_driver_unregister(&snd_gusmax_driver);

	return err;

}



static void __exit alsa_card_gusmax_exit(void)

{

	int idx;



	for (idx = 0; idx < SNDRV_CARDS; idx++)

		snd_card_free(snd_gusmax_cards[idx]);

	platform_driver_unregister(&snd_gusmax_driver);

}



module_init(alsa_card_gusmax_init)

sound/isa/gus/interwave.c

+158 −134

File changed.

Preview size limit exceeded, changes collapsed.