2011-03-14 15:27:27

by Sergei Shtylyov

Subject: [PATCH] cpqarray: use pci_dev->revision

This driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it wasn't
converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all
drivers to use pci_device->revision).

Signed-off-by: Sergei Shtylyov <[email protected]>

---
The patch is against the recent Linus' tree.

drivers/block/cpqarray.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/block/cpqarray.c
===================================================================
--- linux-2.6.orig/drivers/block/cpqarray.c
+++ linux-2.6/drivers/block/cpqarray.c
@@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t
}
vendor_id = pdev->vendor;
device_id = pdev->device;
+ revision = pdev->revision;
irq = pdev->irq;

for(i=0; i<6; i++)
@@ -632,7 +633,6 @@ static int cpqarray_pci_init(ctlr_info_t
}

pci_read_config_word(pdev, PCI_COMMAND, &command);
- pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer);

2011-03-21 18:58:53

by Mike Miller

Subject: RE: [PATCH] cpqarray: use pci_dev->revision

> -----Original Message-----
> From: Sergei Shtylyov [mailto:[email protected]]
> Sent: Monday, March 14, 2011 10:26 AM
> To: [email protected]; [email protected]; ISS
> StorageDev
> Subject: [PATCH] cpqarray: use pci_dev->revision
>
> This driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it
> wasn't
> converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI:
> Change all
> drivers to use pci_device->revision).
>
> Signed-off-by: Sergei Shtylyov <[email protected]>
>

Acked-by: Mike Miller <[email protected]>

> ---
> The patch is against the recent Linus' tree.
>
> drivers/block/cpqarray.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/drivers/block/cpqarray.c
> ===================================================================
> --- linux-2.6.orig/drivers/block/cpqarray.c
> +++ linux-2.6/drivers/block/cpqarray.c
> @@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t
> }
> vendor_id = pdev->vendor;
> device_id = pdev->device;
> + revision = pdev->revision;
> irq = pdev->irq;
>
> for(i=0; i<6; i++)
> @@ -632,7 +633,6 @@ static int cpqarray_pci_init(ctlr_info_t
> }
>
> pci_read_config_word(pdev, PCI_COMMAND, &command);
> - pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
> pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
> pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer);
>