Merge branch 'pci/misc'

- Fix typos in documentation (josh ziegler)

- Use FIELD_MODIFY() instead of open-coding it (Hans Zhang)

* pci/misc:
  PCI: Use FIELD_MODIFY() instead of open-coding it
  Documentation: PCI: Fix typos

diff --cc drivers/pci/controller/dwc/pcie-designware-debugfs.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-designware-ep.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-designware.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-tegra194.c
Simple merge

diff --cc drivers/pci/controller/pci-mvebu.c
Simple merge

diff --cc drivers/pci/controller/pcie-mediatek-gen3.c
Simple merge

diff --cc drivers/pci/iov.c
index 30ca4535fc36af41d2d0c5813593fabf952f6027,fdae70abe80498f2addd221ebc7adbb1d26e2408..b0d24839c084022609c266bcf44d9f775248fc33
--- 1/drivers/pci/iov.c
--- 2/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@@ -947,13 -944,9 +947,12 @@@ static void sriov_restore_vf_rebar_stat
                int bar_idx, size;
  
                pci_read_config_dword(dev, pos + PCI_VF_REBAR_CTRL, &ctrl);
 +              if (PCI_POSSIBLE_ERROR(ctrl))
 +                      return;
 +
                bar_idx = FIELD_GET(PCI_VF_REBAR_CTRL_BAR_IDX, ctrl);
                size = pci_rebar_bytes_to_size(dev->sriov->barsz[bar_idx]);
-               ctrl &= ~PCI_VF_REBAR_CTRL_BAR_SIZE;
-               ctrl |= FIELD_PREP(PCI_VF_REBAR_CTRL_BAR_SIZE, size);
+               FIELD_MODIFY(PCI_VF_REBAR_CTRL_BAR_SIZE, &ctrl, size);
                pci_write_config_dword(dev, pos + PCI_VF_REBAR_CTRL, ctrl);
        }
  }

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/rebar.c
Simple merge

diff --cc drivers/pci/setup-cardbus.c
Simple merge