summaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi/ctdaio.c
diff options
context:
space:
mode:
authorTakashi Iwai2009-06-08 18:10:32 +0200
committerTakashi Iwai2009-06-08 18:10:32 +0200
commit9470195a9cd13e6d90221b8b5d897e9232da8d28 (patch)
tree12f57a49fe94310396f7108c267560c74189c0e0 /sound/pci/ctxfi/ctdaio.c
parentALSA: ctxfi - Fix / clean up hw20k2 chip code (diff)
downloadkernel-qcow2-linux-9470195a9cd13e6d90221b8b5d897e9232da8d28.tar.gz
kernel-qcow2-linux-9470195a9cd13e6d90221b8b5d897e9232da8d28.tar.xz
kernel-qcow2-linux-9470195a9cd13e6d90221b8b5d897e9232da8d28.zip
ALSA: ctxfi - Clean up probe routines
Clean up probe routines and model detection routines so that the driver won't call and check the PCI subsystem id at each time. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/ctdaio.c')
-rw-r--r--sound/pci/ctxfi/ctdaio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index befead4eeaab..082e35c08c02 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -116,7 +116,7 @@ static struct rsc_ops daio_in_rsc_ops_20k2 = {
static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw)
{
- switch (hw->get_chip_type(hw)) {
+ switch (hw->chip_type) {
case ATC20K1:
switch (type) {
case SPDIFOO: return 0;
@@ -343,7 +343,7 @@ static int daio_rsc_init(struct daio *daio,
int err;
unsigned int idx_l, idx_r;
- switch (((struct hw *)hw)->get_chip_type(hw)) {
+ switch (((struct hw *)hw)->chip_type) {
case ATC20K1:
idx_l = idx_20k1[desc->type].left;
idx_r = idx_20k1[desc->type].right;
@@ -367,7 +367,7 @@ static int daio_rsc_init(struct daio *daio,
if (desc->type <= DAIO_OUT_MAX) {
daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops;
} else {
- switch (((struct hw *)hw)->get_chip_type(hw)) {
+ switch (((struct hw *)hw)->chip_type) {
case ATC20K1:
daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k1;
break;