PCI: Change all drivers to use pci_device->revision

Instead of all drivers reading pci config space to get the revision
ID, they can now use the pci_device->revision member.

This exposes some issues where drivers where reading a word or a dword
for the revision number, and adding useless error-handling around the
read. Some drivers even just read it for no purpose of all.

In devices where the revision ID is being copied over and used in what
appears to be the equivalent of hotpath, I have left the copy code
and the cached copy as not to influence the driver's performance.

Compile tested with make all{yes,mod}config on x86_64 and i386.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 4b6bae8eee82..e9b07a97c340 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1413,11 +1413,9 @@ static int __devinit init_setup_hpt372n(struct pci_dev *dev, ide_pci_device_t *d
 static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d)
 {
         struct hpt_info *info;
-        u8 rev = 0, mcr1 = 0;
+        u8 mcr1 = 0;
 
-        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
-
-        if (rev > 1) {
+        if (dev->revision > 1) {
                 d->name = "HPT371N";
 
                 info = &hpt371n;
@@ -1442,11 +1440,8 @@ static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d)
 static int __devinit init_setup_hpt372a(struct pci_dev *dev, ide_pci_device_t *d)
 {
         struct hpt_info *info;
-        u8 rev = 0;
-
-        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
 
-        if (rev > 1) {
+        if (dev->revision > 1) {
                 d->name = "HPT372N";
 
                 info = &hpt372n;
@@ -1460,11 +1455,8 @@ static int __devinit init_setup_hpt372a(struct pci_dev *dev, ide_pci_device_t *d
 static int __devinit init_setup_hpt302(struct pci_dev *dev, ide_pci_device_t *d)
 {
         struct hpt_info *info;
-        u8 rev = 0;
 
-        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
-
-        if (rev > 1) {
+        if (dev->revision > 1) {
                 d->name = "HPT302N";
 
                 info = &hpt302n;
@@ -1478,7 +1470,7 @@ static int __devinit init_setup_hpt302(struct pci_dev *dev, ide_pci_device_t *d)
 static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
 {
         struct pci_dev *dev2;
-        u8 rev = 0;
+        u8 rev = dev->revision;
         static char   *chipset_names[] = { "HPT366", "HPT366",  "HPT368",
                                            "HPT370", "HPT370A", "HPT372",
                                            "HPT372N" };
@@ -1489,8 +1481,6 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
         if (PCI_FUNC(dev->devfn) & 1)
                 return -ENODEV;
 
-        pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
-
         switch (rev) {
         case 0:
         case 1: