aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/asihpi.c
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2010-07-05 16:37:06 -0400
committerTakashi Iwai <tiwai@suse.de>2010-07-06 02:18:27 -0400
commit168f1b07ccc0e8edecb67fab2d0670861853e2fd (patch)
treecabd7e486e1849fbdc221f2e260344cdfc96667a /sound/pci/asihpi/asihpi.c
parent171d9f7d786681e76bb289d01d8f897cbc50de57 (diff)
ALSA: asihpi - HPI API updates
Remove some deprecated items. Change compander api to one function per parameter. Add a version string define. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi/asihpi.c')
-rw-r--r--sound/pci/asihpi/asihpi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 1db586af4f9c..91218f77217f 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1383,7 +1383,7 @@ static char *asihpi_src_names[] =
1383 1383
1384compile_time_assert( 1384compile_time_assert(
1385 (ARRAY_SIZE(asihpi_src_names) == 1385 (ARRAY_SIZE(asihpi_src_names) ==
1386 (HPI_SOURCENODE_LAST_INDEX-HPI_SOURCENODE_BASE+1)), 1386 (HPI_SOURCENODE_LAST_INDEX-HPI_SOURCENODE_NONE+1)),
1387 assert_src_names_size); 1387 assert_src_names_size);
1388 1388
1389#if ASI_STYLE_NAMES 1389#if ASI_STYLE_NAMES
@@ -1414,7 +1414,7 @@ static char *asihpi_dst_names[] =
1414 1414
1415compile_time_assert( 1415compile_time_assert(
1416 (ARRAY_SIZE(asihpi_dst_names) == 1416 (ARRAY_SIZE(asihpi_dst_names) ==
1417 (HPI_DESTNODE_LAST_INDEX-HPI_DESTNODE_BASE+1)), 1417 (HPI_DESTNODE_LAST_INDEX-HPI_DESTNODE_NONE+1)),
1418 assert_dst_names_size); 1418 assert_dst_names_size);
1419 1419
1420static inline int ctl_add(struct snd_card *card, struct snd_kcontrol_new *ctl, 1420static inline int ctl_add(struct snd_card *card, struct snd_kcontrol_new *ctl,
@@ -2171,7 +2171,7 @@ static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol,
2171 &src_node_type, &src_node_index); 2171 &src_node_type, &src_node_index);
2172 2172
2173 sprintf(uinfo->value.enumerated.name, "%s %d", 2173 sprintf(uinfo->value.enumerated.name, "%s %d",
2174 asihpi_src_names[src_node_type - HPI_SOURCENODE_BASE], 2174 asihpi_src_names[src_node_type - HPI_SOURCENODE_NONE],
2175 src_node_index); 2175 src_node_index);
2176 return 0; 2176 return 0;
2177} 2177}
@@ -2603,8 +2603,8 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
2603 2603
2604 } 2604 }
2605 2605
2606 hpi_ctl.src_node_type -= HPI_SOURCENODE_BASE; 2606 hpi_ctl.src_node_type -= HPI_SOURCENODE_NONE;
2607 hpi_ctl.dst_node_type -= HPI_DESTNODE_BASE; 2607 hpi_ctl.dst_node_type -= HPI_DESTNODE_NONE;
2608 2608
2609 /* ASI50xx in SSX mode has multiple meters on the same node. 2609 /* ASI50xx in SSX mode has multiple meters on the same node.
2610 Use subindex to create distinct ALSA controls 2610 Use subindex to create distinct ALSA controls