diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-09-21 04:02:13 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-09-21 04:02:13 -0400 |
commit | 5a3a76e6c35fa236fc234d17a98edeb41d49130f (patch) | |
tree | 8387e33209444ca3e9e7bdd15ecf2ca4d1a42cb4 /drivers/block | |
parent | e03c8dd14915fabc101aa495828d58598dc5af98 (diff) |
drivers/block/cpqarray.c: use pci_dev->revision
This driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it
wasn't converted by commit 44c10138fd4bbc4b6 ("PCI: Change all drivers to
use pci_device->revision").
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: Mike Miller <mike.miller@hp.com>
Cc: Chirag Kantharia <chirag.kantharia@hp.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/cpqarray.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index b2fceb53e809..9125bbeacd4d 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
@@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
620 | } | 620 | } |
621 | vendor_id = pdev->vendor; | 621 | vendor_id = pdev->vendor; |
622 | device_id = pdev->device; | 622 | device_id = pdev->device; |
623 | revision = pdev->revision; | ||
623 | irq = pdev->irq; | 624 | irq = pdev->irq; |
624 | 625 | ||
625 | for(i=0; i<6; i++) | 626 | for(i=0; i<6; i++) |
@@ -632,7 +633,6 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
632 | } | 633 | } |
633 | 634 | ||
634 | pci_read_config_word(pdev, PCI_COMMAND, &command); | 635 | pci_read_config_word(pdev, PCI_COMMAND, &command); |
635 | pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision); | ||
636 | pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size); | 636 | pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size); |
637 | pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer); | 637 | pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer); |
638 | 638 | ||