diff options
| author | Bjørn Mork <bjorn@mork.no> | 2011-03-21 10:35:56 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 06:26:16 -0400 |
| commit | abd34d8d6b213c792c1a06fd75488595c5fb6d3f (patch) | |
| tree | d5aa6d8081e8bb7ad152153f28e29f472fe4e304 /drivers/media/dvb | |
| parent | ec0c8d555a93aa7e2c5c4f11f12686e5b2245696 (diff) | |
[media] use pci_dev->revision
pci_setup_device() has saved the PCI revision in the pci_dev
struct since Linux 2.6.23. Use it.
Cc: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop-pci.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/bt8xx/bt878.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_pci.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c index 03f96d6ca894..44f8fb5f17ff 100644 --- a/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/drivers/media/dvb/b2c2/flexcop-pci.c | |||
| @@ -290,10 +290,8 @@ static void flexcop_pci_dma_exit(struct flexcop_pci *fc_pci) | |||
| 290 | static int flexcop_pci_init(struct flexcop_pci *fc_pci) | 290 | static int flexcop_pci_init(struct flexcop_pci *fc_pci) |
| 291 | { | 291 | { |
| 292 | int ret; | 292 | int ret; |
| 293 | u8 card_rev; | ||
| 294 | 293 | ||
| 295 | pci_read_config_byte(fc_pci->pdev, PCI_CLASS_REVISION, &card_rev); | 294 | info("card revision %x", fc_pci->pdev->revision); |
| 296 | info("card revision %x", card_rev); | ||
| 297 | 295 | ||
| 298 | if ((ret = pci_enable_device(fc_pci->pdev)) != 0) | 296 | if ((ret = pci_enable_device(fc_pci->pdev)) != 0) |
| 299 | return ret; | 297 | return ret; |
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index 99d62094f908..b34fa95185e4 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
| @@ -460,7 +460,7 @@ static int __devinit bt878_probe(struct pci_dev *dev, | |||
| 460 | goto fail0; | 460 | goto fail0; |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | pci_read_config_byte(dev, PCI_CLASS_REVISION, &bt->revision); | 463 | bt->revision = dev->revision; |
| 464 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); | 464 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); |
| 465 | 465 | ||
| 466 | 466 | ||
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c index 10a432a79d00..371558af2d96 100644 --- a/drivers/media/dvb/mantis/mantis_pci.c +++ b/drivers/media/dvb/mantis/mantis_pci.c | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | 48 | ||
| 49 | int __devinit mantis_pci_init(struct mantis_pci *mantis) | 49 | int __devinit mantis_pci_init(struct mantis_pci *mantis) |
| 50 | { | 50 | { |
| 51 | u8 revision, latency; | 51 | u8 latency; |
| 52 | struct mantis_hwconfig *config = mantis->hwconfig; | 52 | struct mantis_hwconfig *config = mantis->hwconfig; |
| 53 | struct pci_dev *pdev = mantis->pdev; | 53 | struct pci_dev *pdev = mantis->pdev; |
| 54 | int err, ret = 0; | 54 | int err, ret = 0; |
| @@ -95,9 +95,8 @@ int __devinit mantis_pci_init(struct mantis_pci *mantis) | |||
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency); | 97 | pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency); |
| 98 | pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision); | ||
| 99 | mantis->latency = latency; | 98 | mantis->latency = latency; |
| 100 | mantis->revision = revision; | 99 | mantis->revision = pdev->revision; |
| 101 | 100 | ||
| 102 | dprintk(MANTIS_ERROR, 0, " Mantis Rev %d [%04x:%04x], ", | 101 | dprintk(MANTIS_ERROR, 0, " Mantis Rev %d [%04x:%04x], ", |
| 103 | mantis->revision, | 102 | mantis->revision, |
