diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:08 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:08 -0400 |
commit | fc212bb1fb538f9453d9ea2cca09749e602055a6 (patch) | |
tree | 4f3bbad508c9be75f3823b7059f615e4b01d785e /drivers/ide/pci/sgiioc4.c | |
parent | 1afa65549266a2094d985508a88ab41d9c40ab44 (diff) |
ide: use pci_dev->revision
Some places were using PCI_CLASS_REVISION instead of PCI_REVISION_ID so
they were not converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65.
Cc: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index b0cf6add691d..5af74ea1d46e 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -691,14 +691,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
691 | static unsigned int __devinit | 691 | static unsigned int __devinit |
692 | pci_init_sgiioc4(struct pci_dev *dev) | 692 | pci_init_sgiioc4(struct pci_dev *dev) |
693 | { | 693 | { |
694 | unsigned int class_rev; | ||
695 | int ret; | 694 | int ret; |
696 | 695 | ||
697 | pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev); | ||
698 | class_rev &= 0xff; | ||
699 | printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n", | 696 | printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n", |
700 | DRV_NAME, pci_name(dev), class_rev); | 697 | DRV_NAME, pci_name(dev), dev->revision); |
701 | if (class_rev < IOC4_SUPPORTED_FIRMWARE_REV) { | 698 | |
699 | if (dev->revision < IOC4_SUPPORTED_FIRMWARE_REV) { | ||
702 | printk(KERN_ERR "Skipping %s IDE controller in slot %s: " | 700 | printk(KERN_ERR "Skipping %s IDE controller in slot %s: " |
703 | "firmware is obsolete - please upgrade to " | 701 | "firmware is obsolete - please upgrade to " |
704 | "revision46 or higher\n", | 702 | "revision46 or higher\n", |