[PATCH resend] cpqarray: use pci_dev->revision

[PATCH resend] cpqarray: use pci_dev->revision

[Sergei Shtylyov]

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 <sshtylyov@ru.mvista.com>

---
The patch is against the recent Linus' tree.
It wasn't merged in 2.6.39 time, I hope it can be merged to 2.6.40...

 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);
 

[PATCH resend] cpqarray: use pci_dev->revision

[Sergei Shtylyov]

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 <sshtylyov@ru.mvista.com>

---
The patch is against the recent Linus' tree.
It wasn't merged in either 2.6.39 or 3.0 time, hopefully it can be merged to
3.1...

 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);
 

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

[Miller, Mike (OS Dev)]

-- mikem

"If men are so wicked with religion, what would they be if without it?" --Benjamin Franklin 


> -----Original Message-----
> From: Sergei Shtylyov [mailto:sshtylyov@ru.mvista.com]
> Sent: Thursday, July 21, 2011 10:51 AM
> To: linux-kernel@vger.kernel.org; chirag.kantharia@hp.com; ISS
> StorageDev
> Subject: [PATCH resend] 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 <sshtylyov@ru.mvista.com>
> 
> ---
> The patch is against the recent Linus' tree.
> It wasn't merged in either 2.6.39 or 3.0 time, hopefully it can be
> merged to
> 3.1...
> 
>  drivers/block/cpqarray.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Acked-by: Mike Miller <mike.miller@hp.com>

> 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);
>