lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Char: rocket, remove pci_read_config_dword(CLASS_REVISION)

Browse Source 
We may use pdev->revision instead of reading pci config space directly, so
remove pci_read_config_dword invoking.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
2007-10-18 03:06:28 -07:00
committed by Linus Torvalds
parent c148b9d555
commit 57fedc7ae5
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/rocket.c
View File

@@ -1873,8 +1873,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
int fast_clock = 0; int fast_clock = 0;
int altChanRingIndicator = 0; int altChanRingIndicator = 0;
int ports_per_aiop = 8; int ports_per_aiop = 8;
int ret;
unsigned int class_rev;
WordIO_t ConfigIO = 0; WordIO_t ConfigIO = 0;
ByteIO_t UPCIRingInd = 0; ByteIO_t UPCIRingInd = 0;
@@ -1882,12 +1880,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
return 0; return 0;
rcktpt_io_addr[i] = pci_resource_start(dev, 0); rcktpt_io_addr[i] = pci_resource_start(dev, 0);
ret = pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
if (ret) {
printk(KERN_INFO " Error during register_PCI(), unable to read config dword \n");
return 0;
}
rcktpt_type[i] = ROCKET_TYPE_NORMAL; rcktpt_type[i] = ROCKET_TYPE_NORMAL;
rocketModel[i].loadrm2 = 0; rocketModel[i].loadrm2 = 0;
@@ -2041,8 +2033,9 @@ static __init int register_PCI(int i, struct pci_dev *dev)
ports_per_aiop = 6; ports_per_aiop = 6;
str = "6-port"; str = "6-port";
/* If class_rev is 1, the rocketmodem flash must be loaded. If it is 2 it is a "socketed" version. */ /* If revision is 1, the rocketmodem flash must be loaded.
if ((class_rev & 0xFF) == 1) { * If it is 2 it is a "socketed" version. */
if (dev->revision == 1) {
rcktpt_type[i] = ROCKET_TYPE_MODEMII; rcktpt_type[i] = ROCKET_TYPE_MODEMII;
rocketModel[i].loadrm2 = 1; rocketModel[i].loadrm2 = 1;
} else { } else {
@@ -2057,7 +2050,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
max_num_aiops = 1; max_num_aiops = 1;
ports_per_aiop = 4; ports_per_aiop = 4;
str = "4-port"; str = "4-port";
if ((class_rev & 0xFF) == 1) { if (dev->revision == 1) {
rcktpt_type[i] = ROCKET_TYPE_MODEMII; rcktpt_type[i] = ROCKET_TYPE_MODEMII;
rocketModel[i].loadrm2 = 1; rocketModel[i].loadrm2 = 1;
} else { } else {