diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2007-06-08 18:46:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-11 19:02:10 -0400 |
commit | 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (patch) | |
tree | 6e16d3ec80c87490dc743f72da086356f2906ace /sound/pci/atiixp_modem.c | |
parent | b8a3a5214d7cc115f1ca3a3967b7229d97c46f4a (diff) |
PCI: Change all drivers to use pci_device->revision
Instead of all drivers reading pci config space to get the revision
ID, they can now use the pci_device->revision member.
This exposes some issues where drivers where reading a word or a dword
for the revision number, and adding useless error-handling around the
read. Some drivers even just read it for no purpose of all.
In devices where the revision ID is being copied over and used in what
appears to be the equivalent of hotpath, I have left the copy code
and the cached copy as not to influence the driver's performance.
Compile tested with make all{yes,mod}config on x86_64 and i386.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/pci/atiixp_modem.c')
-rw-r--r-- | sound/pci/atiixp_modem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 904023fe4f2..ce752f84457 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -1283,15 +1283,12 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci, | |||
1283 | { | 1283 | { |
1284 | struct snd_card *card; | 1284 | struct snd_card *card; |
1285 | struct atiixp_modem *chip; | 1285 | struct atiixp_modem *chip; |
1286 | unsigned char revision; | ||
1287 | int err; | 1286 | int err; |
1288 | 1287 | ||
1289 | card = snd_card_new(index, id, THIS_MODULE, 0); | 1288 | card = snd_card_new(index, id, THIS_MODULE, 0); |
1290 | if (card == NULL) | 1289 | if (card == NULL) |
1291 | return -ENOMEM; | 1290 | return -ENOMEM; |
1292 | 1291 | ||
1293 | pci_read_config_byte(pci, PCI_REVISION_ID, &revision); | ||
1294 | |||
1295 | strcpy(card->driver, "ATIIXP-MODEM"); | 1292 | strcpy(card->driver, "ATIIXP-MODEM"); |
1296 | strcpy(card->shortname, "ATI IXP Modem"); | 1293 | strcpy(card->shortname, "ATI IXP Modem"); |
1297 | if ((err = snd_atiixp_create(card, pci, &chip)) < 0) | 1294 | if ((err = snd_atiixp_create(card, pci, &chip)) < 0) |
@@ -1312,7 +1309,7 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci, | |||
1312 | snd_atiixp_chip_start(chip); | 1309 | snd_atiixp_chip_start(chip); |
1313 | 1310 | ||
1314 | sprintf(card->longname, "%s rev %x at 0x%lx, irq %i", | 1311 | sprintf(card->longname, "%s rev %x at 0x%lx, irq %i", |
1315 | card->shortname, revision, chip->addr, chip->irq); | 1312 | card->shortname, pci->revision, chip->addr, chip->irq); |
1316 | 1313 | ||
1317 | if ((err = snd_card_register(card)) < 0) | 1314 | if ((err = snd_card_register(card)) < 0) |
1318 | goto __error; | 1315 | goto __error; |