Skip to content

L
linux
Commit e0f8cb5f authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files
Options

ALSA: mips: remove __dev* attributes 

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 325fbfe0
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
sound/mips/au1x00.c
View file @ e0f8cb5f
...@@ -439,7 +439,7 @@ static struct snd_pcm_ops snd_card_au1000_capture_ops = { ...@@ -439,7 +439,7 @@ static struct snd_pcm_ops snd_card_au1000_capture_ops = {
.pointer = snd_au1000_pointer, .pointer = snd_au1000_pointer,
}; };
static int __devinit static int
snd_au1000_pcm_new(struct snd_au1000 *au1000) snd_au1000_pcm_new(struct snd_au1000 *au1000)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
...@@ -552,7 +552,7 @@ get the interrupt driven case to work efficiently */ ...@@ -552,7 +552,7 @@ get the interrupt driven case to work efficiently */
spin_unlock(&au1000->ac97_lock); spin_unlock(&au1000->ac97_lock);
} }
static int __devinit static int
snd_au1000_ac97_new(struct snd_au1000 *au1000) snd_au1000_ac97_new(struct snd_au1000 *au1000)
{ {
int err; int err;
......
sound/mips/hal2.c
View file @ e0f8cb5f
...@@ -260,7 +260,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, ...@@ -260,7 +260,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol,
return old != new; return old != new;
} }
static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = { static struct snd_kcontrol_new hal2_ctrl_headphone = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Headphone Playback Volume", .name = "Headphone Playback Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
...@@ -270,7 +270,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = { ...@@ -270,7 +270,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = {
.put = hal2_gain_put, .put = hal2_gain_put,
}; };
static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = { static struct snd_kcontrol_new hal2_ctrl_mic = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Capture Volume", .name = "Mic Capture Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
...@@ -280,7 +280,7 @@ static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = { ...@@ -280,7 +280,7 @@ static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = {
.put = hal2_gain_put, .put = hal2_gain_put,
}; };
static int __devinit hal2_mixer_create(struct snd_hal2 *hal2) static int hal2_mixer_create(struct snd_hal2 *hal2)
{ {
int err; int err;
...@@ -733,7 +733,7 @@ static struct snd_pcm_ops hal2_capture_ops = { ...@@ -733,7 +733,7 @@ static struct snd_pcm_ops hal2_capture_ops = {
.ack = hal2_capture_ack, .ack = hal2_capture_ack,
}; };
static int __devinit hal2_pcm_create(struct snd_hal2 *hal2) static int hal2_pcm_create(struct snd_hal2 *hal2)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
...@@ -874,7 +874,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip) ...@@ -874,7 +874,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)
return 0; return 0;
} }
static int __devinit hal2_probe(struct platform_device *pdev) static int hal2_probe(struct platform_device *pdev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_hal2 *chip; struct snd_hal2 *chip;
...@@ -917,7 +917,7 @@ static int __devinit hal2_probe(struct platform_device *pdev) ...@@ -917,7 +917,7 @@ static int __devinit hal2_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit hal2_remove(struct platform_device *pdev) static int hal2_remove(struct platform_device *pdev)
{ {
struct snd_card *card = platform_get_drvdata(pdev); struct snd_card *card = platform_get_drvdata(pdev);
...@@ -928,7 +928,7 @@ static int __devexit hal2_remove(struct platform_device *pdev) ...@@ -928,7 +928,7 @@ static int __devexit hal2_remove(struct platform_device *pdev)
static struct platform_driver hal2_driver = { static struct platform_driver hal2_driver = {
.probe = hal2_probe, .probe = hal2_probe,
.remove = __devexit_p(hal2_remove), .remove = hal2_remove,
.driver = { .driver = {
.name = "sgihal2", .name = "sgihal2",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/mips/sgio2audio.c
View file @ e0f8cb5f
...@@ -237,7 +237,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol, ...@@ -237,7 +237,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol,
} }
/* dac1/pcm0 mixer control */ /* dac1/pcm0 mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Volume", .name = "PCM Playback Volume",
.index = 0, .index = 0,
...@@ -249,7 +249,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = { ...@@ -249,7 +249,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = {
}; };
/* dac2/pcm1 mixer control */ /* dac2/pcm1 mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Volume", .name = "PCM Playback Volume",
.index = 1, .index = 1,
...@@ -261,7 +261,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = { ...@@ -261,7 +261,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = {
}; };
/* record level mixer control */ /* record level mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Capture Volume", .name = "Capture Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
...@@ -272,7 +272,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = { ...@@ -272,7 +272,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = {
}; };
/* record level source control */ /* record level source control */
static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Capture Source", .name = "Capture Source",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
...@@ -282,7 +282,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = { ...@@ -282,7 +282,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = {
}; };
/* line mixer control */ /* line mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_line = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Line Playback Volume", .name = "Line Playback Volume",
.index = 0, .index = 0,
...@@ -294,7 +294,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = { ...@@ -294,7 +294,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = {
}; };
/* cd mixer control */ /* cd mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_cd = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Line Playback Volume", .name = "Line Playback Volume",
.index = 1, .index = 1,
...@@ -306,7 +306,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = { ...@@ -306,7 +306,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = {
}; };
/* mic mixer control */ /* mic mixer control */
static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = { static struct snd_kcontrol_new sgio2audio_ctrl_mic = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Playback Volume", .name = "Mic Playback Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
...@@ -317,7 +317,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = { ...@@ -317,7 +317,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = {
}; };
static int __devinit snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip) static int snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip)
{ {
int err; int err;
...@@ -726,7 +726,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = { ...@@ -726,7 +726,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
*/ */
/* create a pcm device */ /* create a pcm device */
static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip) static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
...@@ -834,8 +834,8 @@ static struct snd_device_ops ops = { ...@@ -834,8 +834,8 @@ static struct snd_device_ops ops = {
.dev_free = snd_sgio2audio_dev_free, .dev_free = snd_sgio2audio_dev_free,
}; };
static int __devinit snd_sgio2audio_create(struct snd_card *card, static int snd_sgio2audio_create(struct snd_card *card,
struct snd_sgio2audio **rchip) struct snd_sgio2audio **rchip)
{ {
struct snd_sgio2audio *chip; struct snd_sgio2audio *chip;
int i, err; int i, err;
...@@ -914,7 +914,7 @@ static int __devinit snd_sgio2audio_create(struct snd_card *card, ...@@ -914,7 +914,7 @@ static int __devinit snd_sgio2audio_create(struct snd_card *card,
return 0; return 0;
} }
static int __devinit snd_sgio2audio_probe(struct platform_device *pdev) static int snd_sgio2audio_probe(struct platform_device *pdev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_sgio2audio *chip; struct snd_sgio2audio *chip;
...@@ -958,7 +958,7 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev) ...@@ -958,7 +958,7 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit snd_sgio2audio_remove(struct platform_device *pdev) static int snd_sgio2audio_remove(struct platform_device *pdev)
{ {
struct snd_card *card = platform_get_drvdata(pdev); struct snd_card *card = platform_get_drvdata(pdev);
...@@ -969,7 +969,7 @@ static int __devexit snd_sgio2audio_remove(struct platform_device *pdev) ...@@ -969,7 +969,7 @@ static int __devexit snd_sgio2audio_remove(struct platform_device *pdev)
static struct platform_driver sgio2audio_driver = { static struct platform_driver sgio2audio_driver = {
.probe = snd_sgio2audio_probe, .probe = snd_sgio2audio_probe,
.remove = __devexit_p(snd_sgio2audio_remove), .remove = snd_sgio2audio_remove,
.driver = { .driver = {
.name = "sgio2audio", .name = "sgio2audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7