aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/als300.c6
-rw-r--r--sound/pci/hda/patch_realtek.c6
-rw-r--r--sound/pci/hda/patch_sigmatel.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 9f406fbe0d95..8afcb98ca7bb 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -444,7 +444,7 @@ static int snd_als300_capture_close(struct snd_pcm_substream *substream)
444} 444}
445 445
446static int snd_als300_pcm_hw_params(struct snd_pcm_substream *substream, 446static int snd_als300_pcm_hw_params(struct snd_pcm_substream *substream,
447 snd_pcm_hw_params_t * hw_params) 447 struct snd_pcm_hw_params *hw_params)
448{ 448{
449 return snd_pcm_lib_malloc_pages(substream, 449 return snd_pcm_lib_malloc_pages(substream,
450 params_buffer_bytes(hw_params)); 450 params_buffer_bytes(hw_params));
@@ -673,7 +673,7 @@ static void snd_als300_init(struct snd_als300 *chip)
673 snd_als300_dbgcallleave(); 673 snd_als300_dbgcallleave();
674} 674}
675 675
676static int __devinit snd_als300_create(snd_card_t *card, 676static int __devinit snd_als300_create(struct snd_card *card,
677 struct pci_dev *pci, int chip_type, 677 struct pci_dev *pci, int chip_type,
678 struct snd_als300 **rchip) 678 struct snd_als300 **rchip)
679{ 679{
@@ -681,7 +681,7 @@ static int __devinit snd_als300_create(snd_card_t *card,
681 void *irq_handler; 681 void *irq_handler;
682 int err; 682 int err;
683 683
684 static snd_device_ops_t ops = { 684 static struct snd_device_ops ops = {
685 .dev_free = snd_als300_dev_free, 685 .dev_free = snd_als300_dev_free,
686 }; 686 };
687 *rchip = NULL; 687 *rchip = NULL;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 60f199459ad4..02c465147d98 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5115,7 +5115,7 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
5115 { } /* end */ 5115 { } /* end */
5116}; 5116};
5117 5117
5118static snd_kcontrol_new_t alc883_fivestack_mixer[] = { 5118static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
5119 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), 5119 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
5120 HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), 5120 HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
5121 HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), 5121 HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -6799,7 +6799,7 @@ static struct snd_kcontrol_new alc861_3ST_mixer[] = {
6799 { } /* end */ 6799 { } /* end */
6800}; 6800};
6801 6801
6802static snd_kcontrol_new_t alc861_toshiba_mixer[] = { 6802static struct snd_kcontrol_new alc861_toshiba_mixer[] = {
6803 /* output mixer control */ 6803 /* output mixer control */
6804 HDA_CODEC_MUTE("Master Playback Switch", 0x03, 0x0, HDA_OUTPUT), 6804 HDA_CODEC_MUTE("Master Playback Switch", 0x03, 0x0, HDA_OUTPUT),
6805 HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT), 6805 HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
@@ -6905,7 +6905,7 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = {
6905}; 6905};
6906 6906
6907/* additional mixer */ 6907/* additional mixer */
6908static snd_kcontrol_new_t alc861_asus_laptop_mixer[] = { 6908static struct snd_kcontrol_new alc861_asus_laptop_mixer[] = {
6909 HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT), 6909 HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
6910 HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT), 6910 HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
6911 HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x23, 0x0, HDA_OUTPUT), 6911 HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x23, 0x0, HDA_OUTPUT),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 1b428a1eafd0..c8696ddc03ac 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -301,7 +301,7 @@ static struct snd_kcontrol_new stac9227_mixer[] = {
301 { } /* end */ 301 { } /* end */
302}; 302};
303 303
304static snd_kcontrol_new_t stac927x_mixer[] = { 304static struct snd_kcontrol_new stac927x_mixer[] = {
305 { 305 {
306 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 306 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
307 .name = "Input Source", 307 .name = "Input Source",
@@ -316,7 +316,7 @@ static snd_kcontrol_new_t stac927x_mixer[] = {
316 { } /* end */ 316 { } /* end */
317}; 317};
318 318
319static snd_kcontrol_new_t stac9205_mixer[] = { 319static struct snd_kcontrol_new stac9205_mixer[] = {
320 { 320 {
321 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 321 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
322 .name = "Digital Input Source", 322 .name = "Digital Input Source",