summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-14 15:17:16 +0200
committerTakashi Iwai <tiwai@suse.de>2009-05-14 15:17:16 +0200
commit35b053becb64eba13f3ea5c8c51023997169ff34 (patch)
tree38843d98f196832ee28791f27408dfdd4d4e0a92
parent9fc20f030ba457d20eb994e1def7e2ce7d5ae1a8 (diff)
downloadop-kernel-dev-35b053becb64eba13f3ea5c8c51023997169ff34.zip
op-kernel-dev-35b053becb64eba13f3ea5c8c51023997169ff34.tar.gz
ALSA: ctxfi - Avoid unneeded pci_read_config_*() calls
Use struct pci subsystem_device and revision fields instead of unneeded calls of pci_read_config_*(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ctxfi/ctatc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 073fe2a..f523450 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1190,14 +1190,14 @@ static int atc_dev_free(struct snd_device *dev)
static int atc_identify_card(struct ct_atc *atc)
{
- u16 subsys = 0;
- u8 revision = 0;
+ u16 subsys;
+ u8 revision;
struct pci_dev *pci = atc->pci;
const struct ct_atc_chip_details *d;
enum CTCARDS i;
- pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsys);
- pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
+ subsys = pci->subsystem_device;
+ revision = pci->revision;
atc->chip_details = NULL;
atc->model = NUM_CTCARDS;
for (d = atc_chip_details; d->vendor; d++) {
@@ -1308,7 +1308,7 @@ static int atc_get_resources(struct ct_atc *atc)
struct sum_desc sum_dsc = {0};
struct sum_mgr *sum_mgr = NULL;
int err = 0, i = 0;
- unsigned short subsys_id = 0;
+ unsigned short subsys_id;
atc->daios = kzalloc(sizeof(void *)*(DAIONUM), GFP_KERNEL);
if (NULL == atc->daios)
@@ -1339,7 +1339,7 @@ static int atc_get_resources(struct ct_atc *atc)
}
atc->n_daio++;
}
- pci_read_config_word(atc->pci, PCI_SUBSYSTEM_ID, &subsys_id);
+ subsys_id = atc->pci->subsystem_device;
if ((subsys_id == 0x0029) || (subsys_id == 0x0031)) {
/* SB073x cards */
da_desc.type = SPDIFI1;
OpenPOWER on IntegriCloud