projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into upstream-jgarzik
[powerpc.git]
/
sound
/
drivers
/
dummy.c
diff --git
a/sound/drivers/dummy.c
b/sound/drivers/dummy.c
index
8339bad
..
a0f28f5
100644
(file)
--- a/
sound/drivers/dummy.c
+++ b/
sound/drivers/dummy.c
@@
-423,7
+423,8
@@
static struct snd_pcm_ops snd_card_dummy_capture_ops = {
.pointer = snd_card_dummy_pcm_pointer,
};
.pointer = snd_card_dummy_pcm_pointer,
};
-static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams)
+static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
+ int substreams)
{
struct snd_pcm *pcm;
int err;
{
struct snd_pcm *pcm;
int err;
@@
-562,7
+563,7
@@
DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD),
DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)
};
DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)
};
-static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy)
+static int __
dev
init snd_card_dummy_new_mixer(struct snd_dummy *dummy)
{
struct snd_card *card = dummy->card;
unsigned int idx;
{
struct snd_card *card = dummy->card;
unsigned int idx;
@@
-579,7
+580,7
@@
static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy)
return 0;
}
return 0;
}
-static int __init snd_dummy_probe(struct platform_device *devptr)
+static int __
dev
init snd_dummy_probe(struct platform_device *devptr)
{
struct snd_card *card;
struct snd_dummy *dummy;
{
struct snd_card *card;
struct snd_dummy *dummy;
@@
-617,7
+618,7
@@
static int __init snd_dummy_probe(struct platform_device *devptr)
return err;
}
return err;
}
-static int snd_dummy_remove(struct platform_device *devptr)
+static int
__devexit
snd_dummy_remove(struct platform_device *devptr)
{
snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL);
{
snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL);
@@
-648,7
+649,7
@@
static int snd_dummy_resume(struct platform_device *pdev)
static struct platform_driver snd_dummy_driver = {
.probe = snd_dummy_probe,
static struct platform_driver snd_dummy_driver = {
.probe = snd_dummy_probe,
- .remove =
snd_dummy_remove
,
+ .remove =
__devexit_p(snd_dummy_remove)
,
#ifdef CONFIG_PM
.suspend = snd_dummy_suspend,
.resume = snd_dummy_resume,
#ifdef CONFIG_PM
.suspend = snd_dummy_suspend,
.resume = snd_dummy_resume,