diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/radio/radio-gemtek-pci.c | 4 | ||||
-rw-r--r-- | drivers/media/video/meye.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c index fdf5d6e46eac..5e6f17df204b 100644 --- a/drivers/media/radio/radio-gemtek-pci.c +++ b/drivers/media/radio/radio-gemtek-pci.c | |||
@@ -94,7 +94,6 @@ struct gemtek_pci_card { | |||
94 | 94 | ||
95 | u32 iobase; | 95 | u32 iobase; |
96 | u32 length; | 96 | u32 length; |
97 | u8 chiprev; | ||
98 | u16 model; | 97 | u16 model; |
99 | 98 | ||
100 | u32 current_frequency; | 99 | u32 current_frequency; |
@@ -415,7 +414,6 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci | |||
415 | goto err_pci; | 414 | goto err_pci; |
416 | } | 415 | } |
417 | 416 | ||
418 | pci_read_config_byte( pci_dev, PCI_REVISION_ID, &card->chiprev ); | ||
419 | pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &card->model ); | 417 | pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &card->model ); |
420 | 418 | ||
421 | pci_set_drvdata( pci_dev, card ); | 419 | pci_set_drvdata( pci_dev, card ); |
@@ -436,7 +434,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci | |||
436 | gemtek_pci_mute( card ); | 434 | gemtek_pci_mute( card ); |
437 | 435 | ||
438 | printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n", | 436 | printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n", |
439 | card->chiprev, card->iobase, card->iobase + card->length - 1 ); | 437 | pci_dev->revision, card->iobase, card->iobase + card->length - 1 ); |
440 | 438 | ||
441 | return 0; | 439 | return 0; |
442 | 440 | ||
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 664aba8b4d85..7533fc203319 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1809,7 +1809,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, | |||
1809 | { | 1809 | { |
1810 | int ret = -EBUSY; | 1810 | int ret = -EBUSY; |
1811 | unsigned long mchip_adr; | 1811 | unsigned long mchip_adr; |
1812 | u8 revision; | ||
1813 | 1812 | ||
1814 | if (meye.mchip_dev != NULL) { | 1813 | if (meye.mchip_dev != NULL) { |
1815 | printk(KERN_ERR "meye: only one device allowed!\n"); | 1814 | printk(KERN_ERR "meye: only one device allowed!\n"); |
@@ -1885,7 +1884,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, | |||
1885 | goto outreqirq; | 1884 | goto outreqirq; |
1886 | } | 1885 | } |
1887 | 1886 | ||
1888 | pci_read_config_byte(meye.mchip_dev, PCI_REVISION_ID, &revision); | ||
1889 | pci_write_config_byte(meye.mchip_dev, PCI_CACHE_LINE_SIZE, 8); | 1887 | pci_write_config_byte(meye.mchip_dev, PCI_CACHE_LINE_SIZE, 8); |
1890 | pci_write_config_byte(meye.mchip_dev, PCI_LATENCY_TIMER, 64); | 1888 | pci_write_config_byte(meye.mchip_dev, PCI_LATENCY_TIMER, 64); |
1891 | 1889 | ||
@@ -1939,7 +1937,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev, | |||
1939 | printk(KERN_INFO "meye: Motion Eye Camera Driver v%s.\n", | 1937 | printk(KERN_INFO "meye: Motion Eye Camera Driver v%s.\n", |
1940 | MEYE_DRIVER_VERSION); | 1938 | MEYE_DRIVER_VERSION); |
1941 | printk(KERN_INFO "meye: mchip KL5A72002 rev. %d, base %lx, irq %d\n", | 1939 | printk(KERN_INFO "meye: mchip KL5A72002 rev. %d, base %lx, irq %d\n", |
1942 | revision, mchip_adr, meye.mchip_irq); | 1940 | meye.mchip_dev->revision, mchip_adr, meye.mchip_irq); |
1943 | 1941 | ||
1944 | return 0; | 1942 | return 0; |
1945 | 1943 | ||