aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/p16v.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:10 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:20:55 -0500
commite23e7a1436207217000c2854214bc908936af3cb (patch)
treeaebb83a4e59dde76a79ac60b51b67849c75c545b /sound/pci/emu10k1/p16v.c
parent445a51b353c35fe54840c10352ef51152fbb94df (diff)
ALSA: pci: 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: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/p16v.c')
-rw-r--r--sound/pci/emu10k1/p16v.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 88cec6b7dd41..7e2025cd6d9c 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -637,7 +637,7 @@ int snd_p16v_free(struct snd_emu10k1 *chip)
637 return 0; 637 return 0;
638} 638}
639 639
640int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm) 640int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
641{ 641{
642 struct snd_pcm *pcm; 642 struct snd_pcm *pcm;
643 struct snd_pcm_substream *substream; 643 struct snd_pcm_substream *substream;
@@ -854,7 +854,7 @@ static const DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);
854 .private_value = ((xreg) | ((xhl) << 8)) \ 854 .private_value = ((xreg) | ((xhl) << 8)) \
855} 855}
856 856
857static struct snd_kcontrol_new p16v_mixer_controls[] __devinitdata = { 857static struct snd_kcontrol_new p16v_mixer_controls[] = {
858 P16V_VOL("HD Analog Front Playback Volume", PLAYBACK_VOLUME_MIXER9, 0), 858 P16V_VOL("HD Analog Front Playback Volume", PLAYBACK_VOLUME_MIXER9, 0),
859 P16V_VOL("HD Analog Rear Playback Volume", PLAYBACK_VOLUME_MIXER10, 1), 859 P16V_VOL("HD Analog Rear Playback Volume", PLAYBACK_VOLUME_MIXER10, 1),
860 P16V_VOL("HD Analog Center/LFE Playback Volume", PLAYBACK_VOLUME_MIXER9, 1), 860 P16V_VOL("HD Analog Center/LFE Playback Volume", PLAYBACK_VOLUME_MIXER9, 1),
@@ -880,7 +880,7 @@ static struct snd_kcontrol_new p16v_mixer_controls[] __devinitdata = {
880}; 880};
881 881
882 882
883int __devinit snd_p16v_mixer(struct snd_emu10k1 *emu) 883int snd_p16v_mixer(struct snd_emu10k1 *emu)
884{ 884{
885 int i, err; 885 int i, err;
886 struct snd_card *card = emu->card; 886 struct snd_card *card = emu->card;
@@ -897,7 +897,7 @@ int __devinit snd_p16v_mixer(struct snd_emu10k1 *emu)
897 897
898#define NUM_CHS 1 /* up to 4, but only first channel is used */ 898#define NUM_CHS 1 /* up to 4, but only first channel is used */
899 899
900int __devinit snd_p16v_alloc_pm_buffer(struct snd_emu10k1 *emu) 900int snd_p16v_alloc_pm_buffer(struct snd_emu10k1 *emu)
901{ 901{
902 emu->p16v_saved = vmalloc(NUM_CHS * 4 * 0x80); 902 emu->p16v_saved = vmalloc(NUM_CHS * 4 * 0x80);
903 if (! emu->p16v_saved) 903 if (! emu->p16v_saved)