diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-08 12:10:32 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-08 12:10:32 -0400 |
commit | 9470195a9cd13e6d90221b8b5d897e9232da8d28 (patch) | |
tree | 12f57a49fe94310396f7108c267560c74189c0e0 /sound/pci/ctxfi/ctdaio.c | |
parent | d362af62ed98f58c64a2b3dd58c79d25ad181b0b (diff) |
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.c | 6 |
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 = { | |||
116 | 116 | ||
117 | static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw) | 117 | static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw) |
118 | { | 118 | { |
119 | switch (hw->get_chip_type(hw)) { | 119 | switch (hw->chip_type) { |
120 | case ATC20K1: | 120 | case ATC20K1: |
121 | switch (type) { | 121 | switch (type) { |
122 | case SPDIFOO: return 0; | 122 | case SPDIFOO: return 0; |
@@ -343,7 +343,7 @@ static int daio_rsc_init(struct daio *daio, | |||
343 | int err; | 343 | int err; |
344 | unsigned int idx_l, idx_r; | 344 | unsigned int idx_l, idx_r; |
345 | 345 | ||
346 | switch (((struct hw *)hw)->get_chip_type(hw)) { | 346 | switch (((struct hw *)hw)->chip_type) { |
347 | case ATC20K1: | 347 | case ATC20K1: |
348 | idx_l = idx_20k1[desc->type].left; | 348 | idx_l = idx_20k1[desc->type].left; |
349 | idx_r = idx_20k1[desc->type].right; | 349 | idx_r = idx_20k1[desc->type].right; |
@@ -367,7 +367,7 @@ static int daio_rsc_init(struct daio *daio, | |||
367 | if (desc->type <= DAIO_OUT_MAX) { | 367 | if (desc->type <= DAIO_OUT_MAX) { |
368 | daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops; | 368 | daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops; |
369 | } else { | 369 | } else { |
370 | switch (((struct hw *)hw)->get_chip_type(hw)) { | 370 | switch (((struct hw *)hw)->chip_type) { |
371 | case ATC20K1: | 371 | case ATC20K1: |
372 | daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k1; | 372 | daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k1; |
373 | break; | 373 | break; |