aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/ad1848
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 16:58:26 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:28:11 +0100
commit686688458e5814ac0aca44fc2033218a848fd2d0 (patch)
treea02ecb0c5d5c35faf4e21728fe0c8a1be37993e3 /sound/isa/ad1848
parentc66d7f72569e304acc134b2561b148fe7c23c0f7 (diff)
downloadkernel_samsung_smdk4412-686688458e5814ac0aca44fc2033218a848fd2d0.zip
kernel_samsung_smdk4412-686688458e5814ac0aca44fc2033218a848fd2d0.tar.gz
kernel_samsung_smdk4412-686688458e5814ac0aca44fc2033218a848fd2d0.tar.bz2
[ALSA] ad1848 - Use platform_device, add PM
Modules: AD1848 driver Rewrite the probe/remove with platform_device. Add the PM support, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/ad1848')
-rw-r--r--sound/isa/ad1848/ad1848.c89
1 files changed, 73 insertions, 16 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index ffc373b..1019e9f 100644
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -23,6 +23,8 @@
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
#include <linux/time.h>
#include <linux/wait.h>
#include <linux/moduleparam.h>
@@ -60,11 +62,10 @@ MODULE_PARM_DESC(dma1, "DMA1 # for AD1848 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 snd_card *snd_ad1848_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
-static int __init snd_card_ad1848_probe(int dev)
+static int __init snd_ad1848_probe(struct platform_device *pdev)
{
+ int dev = pdev->id;
struct snd_card *card;
struct snd_ad1848 *chip;
struct snd_pcm *pcm;
@@ -93,6 +94,7 @@ static int __init snd_card_ad1848_probe(int 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;
@@ -109,13 +111,12 @@ static int __init snd_card_ad1848_probe(int dev)
if (thinkpad[dev])
strcat(card->longname, " [Thinkpad]");
- 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_ad1848_cards[dev] = card;
+ platform_set_drvdata(pdev, card);
return 0;
_err:
@@ -123,29 +124,85 @@ static int __init snd_card_ad1848_probe(int dev)
return err;
}
-static int __init alsa_card_ad1848_init(void)
+static int __devexit snd_ad1848_remove(struct platform_device *devptr)
+{
+ snd_card_free(platform_get_drvdata(devptr));
+ platform_set_drvdata(devptr, NULL);
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int snd_ad1848_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct snd_card *card = platform_get_drvdata(pdev);
+ struct snd_ad1848 *chip = card->private_data;
+
+ snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+ chip->suspend(chip);
+ return 0;
+}
+
+static int snd_ad1848_resume(struct platform_device *pdev)
{
- int dev, cards;
+ struct snd_card *card = platform_get_drvdata(pdev);
+ struct snd_ad1848 *chip = card->private_data;
- for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++)
- if (snd_card_ad1848_probe(dev) >= 0)
- cards++;
+ chip->resume(chip);
+ snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+ return 0;
+}
+#endif
+
+#define SND_AD1848_DRIVER "snd_ad1848"
+
+static struct platform_driver snd_ad1848_driver = {
+ .probe = snd_ad1848_probe,
+ .remove = __devexit_p(snd_ad1848_remove),
+#ifdef CONFIG_PM
+ .suspend = snd_ad1848_suspend,
+ .resume = snd_ad1848_resume,
+#endif
+ .driver = {
+ .name = SND_AD1848_DRIVER
+ },
+};
+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 && enable[i]; i++) {
+ struct platform_device *device;
+ device = platform_device_register_simple(SND_AD1848_DRIVER,
+ i, NULL, 0);
+ if (IS_ERR(device)) {
+ err = PTR_ERR(device);
+ goto errout;
+ }
+ cards++;
+ }
if (!cards) {
#ifdef MODULE
printk(KERN_ERR "AD1848 soundcard not found or device busy\n");
#endif
- return -ENODEV;
+ err = -ENODEV;
+ goto errout;
}
return 0;
+
+ errout:
+ platform_driver_unregister(&snd_ad1848_driver);
+ return err;
}
static void __exit alsa_card_ad1848_exit(void)
{
- int idx;
-
- for (idx = 0; idx < SNDRV_CARDS; idx++)
- snd_card_free(snd_ad1848_cards[idx]);
+ platform_driver_unregister(&snd_ad1848_driver);
}
module_init(alsa_card_ad1848_init)