Commit 21269791 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jens Axboe
Browse files

mtip32xx: prefer pcie_capability_read_word() 



Replace pci_read_config_word() with pcie_capability_read_word().

pcie_capability_read_word() takes care of a few special cases when reading
the PCIe capability.  See 8c0d3a02 ("PCI: Add accessors for PCI Express
Capability").

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 416c0547

drivers/block/mtip32xx/mtip32xx.c

+3 −8
Original line number Diff line number Diff line
@@ -3924,14 +3924,10 @@ static DEFINE_HANDLER(7); 


static void mtip_disable_link_opts(struct driver_data *dd, struct pci_dev *pdev)

{

	int pos;

	unsigned short pcie_dev_ctrl;



	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);

	if (pos) {

		pci_read_config_word(pdev,

			pos + PCI_EXP_DEVCTL,

			&pcie_dev_ctrl);

	if (pci_is_pcie(pdev)) {

		pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &pcie_dev_ctrl);

		if (pcie_dev_ctrl & PCI_EXP_DEVCTL_NOSNOOP_EN ||

		    pcie_dev_ctrl & PCI_EXP_DEVCTL_RELAX_EN) {

			dev_info(&dd->pdev->dev,
@@ -3939,8 +3935,7 @@ static void mtip_disable_link_opts(struct driver_data *dd, struct pci_dev *pdev) 
					pdev->vendor, pdev->device);

			pcie_dev_ctrl &= ~(PCI_EXP_DEVCTL_NOSNOOP_EN |

						PCI_EXP_DEVCTL_RELAX_EN);

			pci_write_config_word(pdev,

				pos + PCI_EXP_DEVCTL,

			pcie_capability_write_word(pdev, PCI_EXP_DEVCTL,

				pcie_dev_ctrl);

		}

	}