Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a3a76e6 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jens Axboe
Browse files

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 44c10138 ("PCI: Change all drivers to
use pci_device->revision").

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Chirag Kantharia <chirag.kantharia@hp.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarAndrew Morton <akpm@google.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e03c8dd1

drivers/block/cpqarray.c

+1 −1
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 
	}

	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 *c, struct pci_dev *pdev) 
	}



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