Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19453bc1 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

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: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5a5b3b5d

drivers/media/video/cx88/cx88-alsa.c

+5 −5
Original line number Diff line number Diff line
@@ -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);