redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (6068): cx88-alsa: Use pci_dev->revision 

The revision is part of the pci_dev struct, so there is no need to read it in.

Stop storing the revision and latency in the chip struct, since they're never
used after being printed out when the driver loads.

linux/pci.h wasn't included.  It was getting picked up something else,
probably cx88.h, but this file uses struct pci_dev so it should include pci.h.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
hifive-unleashed-5.1
Trent Piepho 2007-08-18 22:54:49 -03:00 committed by Mauro Carvalho Chehab
parent 5a5b3b5d4f
commit 19453bc188
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/cx88/cx88-alsa.c
View File

@ -28,6 +28,7 @@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/pci.h>
#include <asm/delay.h>
#include <sound/driver.h>
@ -60,7 +61,6 @@ struct cx88_audio_dev {
/* pci i/o */
struct pci_dev *pci;
unsigned char pci_rev,pci_lat;
/* audio controls */
int irq;
@ -667,6 +667,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
snd_cx88_card_t *chip;
struct cx88_core *core;
int err;
unsigned char pci_lat;
*rchip = NULL;
@ -711,13 +712,12 @@ static int __devinit snd_cx88_create(struct snd_card *card,
}
/* print pci info */
pci_read_config_byte(pci, PCI_CLASS_REVISION, &chip->pci_rev);
pci_read_config_byte(pci, PCI_LATENCY_TIMER, &chip->pci_lat);
pci_read_config_byte(pci, PCI_LATENCY_TIMER, &pci_lat);
dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, "
"latency: %d, mmio: 0x%llx\n", core->name, devno,
pci_name(pci), chip->pci_rev, pci->irq,
chip->pci_lat,(unsigned long long)pci_resource_start(pci,0));
pci_name(pci), pci->revision, pci->irq,
pci_lat, (unsigned long long)pci_resource_start(pci,0));
chip->irq = pci->irq;
synchronize_irq(chip->irq);