fusion: use pci_dev->revision
Subsystems (2)
PATCH 1/1 fusion: 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).
In one case, it even reads PCI revision ID without using it -- that code is now removed...
---
The patch is against the recent Linus' tree.
drivers/message/fusion/mptbase.c | 12 ++++-------- drivers/message/fusion/mptctl.c | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/message/fusion/mptbase.c +4 -8
@@ -1591,7 +1591,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)unsigned long port;u32 msize;u32 psize; -u8 revision;int r = -ENODEV ;struct pci_dev *pdev;
@@ -1608,8 +1607,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)return r; } -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); -if (sizeof (dma_addr_t) >4 ) {const uint64_t required_mask =dma_get_required_mask (&pdev->dev);
@@ -1717,7 +1714,6 @@ mpt_attach(struct pci_dev *pdev, const sMPT_ADAPTER *ioc;u8 cb_idx;int r = -ENODEV ; -u8 revision;u8 pcixcmd;static int mpt_ids =0 ;#ifdef CONFIG_PROC_FS
@@ -1825,8 +1821,8 @@ mpt_attach(struct pci_dev *pdev, const sdinitprintk (ioc,printk (MYIOC_s_INFO_FMT"facts @ %p, pfacts[0] @ %p\n" , ioc->name, &ioc->facts, &ioc->pfacts[0 ])); -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); -mpt_get_product_name (pdev->vendor, pdev->device, revision, ioc->prod_name); +mpt_get_product_name (pdev->vendor, pdev->device, pdev->revision, + ioc->prod_name);switch (pdev->device) {
@@ -1841,7 +1837,7 @@ mpt_attach(struct pci_dev *pdev, const sbreak ;case MPI_MANUFACTPAGE_DEVICEID_FC929X : -if (revision <XL_929 ) { +if (pdev->revision <XL_929 ) {/* 929X Chip Fix. Set Split transactions level * for PCIX. Set MOST bits to zero. */
@@ -1872,7 +1868,7 @@ mpt_attach(struct pci_dev *pdev, const s/* 1030 Chip Fix. Disable Split transactions * for PCIX. Set MOST bits to zero if Rev < C0( = 8). */ -if (revision <C0_1030 ) { +if (pdev->revision <C0_1030 ) {pci_read_config_byte (pdev,0x6a , &pcixcmd); pcixcmd &=0x8F ;pci_write_config_byte (pdev,0x6a , pcixcmd);
drivers/message/fusion/mptctl.c +1 -3
@@ -1250,7 +1250,6 @@ mptctl_getiocinfo (unsigned long arg, unint iocnum;unsigned int port;int cim_rev; -u8 revision;struct scsi_device *sdev;VirtDevice *vdevice;
@@ -1324,8 +1323,7 @@ mptctl_getiocinfo (unsigned long arg, un pdev = (struct pci_dev *) ioc->pcidev; karg->pciId = pdev->device; -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); - karg->hwRev = revision; + karg->hwRev = pdev->revision; karg->subSystemDevice = pdev->subsystem_device; karg->subSystemVendor = pdev->subsystem_vendor;
PATCH RESEND 1/1 fusion: 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).
In one case, it even reads PCI revision ID without using it -- that code is now removed...
---
This patch is against the recent Linus' tree.
This patch hasn't been applied to 3.1, hopefully it can be applied to 3.2...
drivers/message/fusion/mptbase.c | 12 ++++-------- drivers/message/fusion/mptctl.c | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/message/fusion/mptbase.c +4 -8
@@ -1591,7 +1591,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)unsigned long port;u32 msize;u32 psize; -u8 revision;int r = -ENODEV ;struct pci_dev *pdev;
@@ -1608,8 +1607,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)return r; } -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); -if (sizeof (dma_addr_t) >4 ) {const uint64_t required_mask =dma_get_required_mask (&pdev->dev);
@@ -1717,7 +1714,6 @@ mpt_attach(struct pci_dev *pdev, const sMPT_ADAPTER *ioc;u8 cb_idx;int r = -ENODEV ; -u8 revision;u8 pcixcmd;static int mpt_ids =0 ;#ifdef CONFIG_PROC_FS
@@ -1825,8 +1821,8 @@ mpt_attach(struct pci_dev *pdev, const sdinitprintk (ioc,printk (MYIOC_s_INFO_FMT"facts @ %p, pfacts[0] @ %p\n" , ioc->name, &ioc->facts, &ioc->pfacts[0 ])); -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); -mpt_get_product_name (pdev->vendor, pdev->device, revision, ioc->prod_name); +mpt_get_product_name (pdev->vendor, pdev->device, pdev->revision, + ioc->prod_name);switch (pdev->device) {
@@ -1841,7 +1837,7 @@ mpt_attach(struct pci_dev *pdev, const sbreak ;case MPI_MANUFACTPAGE_DEVICEID_FC929X : -if (revision <XL_929 ) { +if (pdev->revision <XL_929 ) {/* 929X Chip Fix. Set Split transactions level * for PCIX. Set MOST bits to zero. */
@@ -1872,7 +1868,7 @@ mpt_attach(struct pci_dev *pdev, const s/* 1030 Chip Fix. Disable Split transactions * for PCIX. Set MOST bits to zero if Rev < C0( = 8). */ -if (revision <C0_1030 ) { +if (pdev->revision <C0_1030 ) {pci_read_config_byte (pdev,0x6a , &pcixcmd); pcixcmd &=0x8F ;pci_write_config_byte (pdev,0x6a , pcixcmd);
drivers/message/fusion/mptctl.c +1 -3
@@ -1250,7 +1250,6 @@ mptctl_getiocinfo (unsigned long arg, unint iocnum;unsigned int port;int cim_rev; -u8 revision;struct scsi_device *sdev;VirtDevice *vdevice;
@@ -1324,8 +1323,7 @@ mptctl_getiocinfo (unsigned long arg, un pdev = (struct pci_dev *) ioc->pcidev; karg->pciId = pdev->device; -pci_read_config_byte (pdev,PCI_CLASS_REVISION , &revision); - karg->hwRev = revision; + karg->hwRev = pdev->revision; karg->subSystemDevice = pdev->subsystem_device; karg->subSystemVendor = pdev->subsystem_vendor;