Commit e2759e33 authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela
Browse files

[ALSA] isa_bus: ad1848 



ad1848: port to isa_bus infrastructure

Signed-off-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 86e1f0df

sound/isa/ad1848/ad1848.c

+67 −100
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <sound/driver.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/isa.h>

#include <linux/time.h>

#include <linux/wait.h>

#include <linux/moduleparam.h>
@@ -32,8 +32,11 @@ 
#include <sound/ad1848.h>

#include <sound/initval.h>



#define CRD_NAME "Generic AD1848/AD1847/CS4248"

#define DEV_NAME "ad1848"



MODULE_DESCRIPTION(CRD_NAME);

MODULE_AUTHOR("Tugrul Galatali <galatalt@stuy.edu>, Jaroslav Kysela <perex@suse.cz>");

MODULE_DESCRIPTION("AD1848/AD1847/CS4248");

MODULE_LICENSE("GPL");

MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1848},"

	        "{Analog Devices,AD1847},"
@@ -48,95 +51,98 @@ static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */ 
static int thinkpad[SNDRV_CARDS];			/* Thinkpad special case */



module_param_array(index, int, NULL, 0444);

MODULE_PARM_DESC(index, "Index value for AD1848 soundcard.");

MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");

module_param_array(id, charp, NULL, 0444);

MODULE_PARM_DESC(id, "ID string for AD1848 soundcard.");

MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable AD1848 soundcard.");

MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");

module_param_array(port, long, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for AD1848 driver.");

MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");

module_param_array(irq, int, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for AD1848 driver.");

MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");

module_param_array(dma1, int, NULL, 0444);

MODULE_PARM_DESC(dma1, "DMA1 # for AD1848 driver.");

MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");

module_param_array(thinkpad, bool, NULL, 0444);

MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");



static struct platform_device *devices[SNDRV_CARDS];

static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)

{

	if (!enable[n])

		return 0;



	if (port[n] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);

		return 0;

	}

	if (irq[n] == SNDRV_AUTO_IRQ) {

		snd_printk(KERN_ERR "%s: please specify irq\n", dev->bus_id);

		return 0;	

	}

	if (dma1[n] == SNDRV_AUTO_DMA) {

		snd_printk(KERN_ERR "%s: please specify dma1\n", dev->bus_id);

		return 0;

	}

	return 1;

}



static int __devinit snd_ad1848_probe(struct platform_device *pdev)

static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)

{

	int dev = pdev->id;

	struct snd_card *card;

	struct snd_ad1848 *chip;

	struct snd_pcm *pcm;

	int err;

	int error;



	if (port[dev] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "ad1848: specify port\n");

		return -EINVAL;

	}

	if (irq[dev] == SNDRV_AUTO_IRQ) {

		snd_printk(KERN_ERR "ad1848: specify irq\n");

		return -EINVAL;

	}

	if (dma1[dev] == SNDRV_AUTO_DMA) {

		snd_printk(KERN_ERR "ad1848: specify dma1\n");

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

	if (!card)

		return -EINVAL;

	}



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

	if (card == NULL)

		return -ENOMEM;

	error = snd_ad1848_create(card, port[n], irq[n], dma1[n],

			thinkpad[n] ? AD1848_HW_THINKPAD : AD1848_HW_DETECT, &chip);

	if (error < 0)

		goto out;



	if ((err = snd_ad1848_create(card, port[dev],

				     irq[dev],

				     dma1[dev],

				     thinkpad[dev] ? AD1848_HW_THINKPAD : AD1848_HW_DETECT,

				     &chip)) < 0)

		goto _err;

	card->private_data = chip;



	if ((err = snd_ad1848_pcm(chip, 0, &pcm)) < 0)

		goto _err;

	error = snd_ad1848_pcm(chip, 0, &pcm);

	if (error < 0)

		goto out;



	if ((err = snd_ad1848_mixer(chip)) < 0)

		goto _err;

	error = snd_ad1848_mixer(chip);

	if (error < 0)

		goto out;



	strcpy(card->driver, "AD1848");

	strcpy(card->shortname, pcm->name);



	sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",

		pcm->name, chip->port, irq[dev], dma1[dev]);



	if (thinkpad[dev])

		pcm->name, chip->port, irq[n], dma1[n]);

	if (thinkpad[n])

		strcat(card->longname, " [Thinkpad]");



	snd_card_set_dev(card, &pdev->dev);

	snd_card_set_dev(card, dev);



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

		goto _err;

	error = snd_card_register(card);

	if (error < 0)

		goto out;



	platform_set_drvdata(pdev, card);

	dev_set_drvdata(dev, card);

	return 0;



 _err:

	snd_card_free(card);

	return err;

out:	snd_card_free(card);

	return error;

}



static int __devexit snd_ad1848_remove(struct platform_device *devptr)

static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);

	snd_card_free(dev_get_drvdata(dev));

	dev_set_drvdata(dev, NULL);

	return 0;

}



#ifdef CONFIG_PM

static int snd_ad1848_suspend(struct platform_device *pdev, pm_message_t state)

static int snd_ad1848_suspend(struct device *dev, unsigned int n, pm_message_t state)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ad1848 *chip = card->private_data;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
@@ -144,9 +150,9 @@ static int snd_ad1848_suspend(struct platform_device *pdev, pm_message_t state) 
	return 0;

}



static int snd_ad1848_resume(struct platform_device *pdev)

static int snd_ad1848_resume(struct device *dev, unsigned int n)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ad1848 *chip = card->private_data;



	chip->resume(chip);
@@ -155,9 +161,8 @@ static int snd_ad1848_resume(struct platform_device *pdev) 
}

#endif



#define SND_AD1848_DRIVER	"snd_ad1848"



static struct platform_driver snd_ad1848_driver = {

static struct isa_driver snd_ad1848_driver = {

	.match		= snd_ad1848_match,

	.probe		= snd_ad1848_probe,

	.remove		= __devexit_p(snd_ad1848_remove),

#ifdef CONFIG_PM
@@ -165,57 +170,19 @@ static struct platform_driver snd_ad1848_driver = { 
	.resume		= snd_ad1848_resume,

#endif

	.driver		= {

		.name	= SND_AD1848_DRIVER

	},

};



static void __init_or_module snd_ad1848_unregister_all(void)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(devices); ++i)

		platform_device_unregister(devices[i]);

	platform_driver_unregister(&snd_ad1848_driver);

		.name	= DEV_NAME

	}

};



static int __init alsa_card_ad1848_init(void)

{

	int i, cards, err;



	err = platform_driver_register(&snd_ad1848_driver);

	if (err < 0)

		return err;



	cards = 0;

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

		struct platform_device *device;

		if (! enable[i])

			continue;

		device = platform_device_register_simple(SND_AD1848_DRIVER,

							 i, NULL, 0);

		if (IS_ERR(device))

			continue;

		if (!platform_get_drvdata(device)) {

			platform_device_unregister(device);

			continue;

		}

		devices[i] = device;

		cards++;

	}

	if (!cards) {

#ifdef MODULE

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

#endif

		snd_ad1848_unregister_all();

		return -ENODEV;

	}

	return 0;

	return isa_register_driver(&snd_ad1848_driver, SNDRV_CARDS);

}



static void __exit alsa_card_ad1848_exit(void)

{

	snd_ad1848_unregister_all();

	isa_unregister_driver(&snd_ad1848_driver);

}



module_init(alsa_card_ad1848_init)

module_exit(alsa_card_ad1848_exit)
 
module_init(alsa_card_ad1848_init);

module_exit(alsa_card_ad1848_exit);