Commit 2c2fb7a8aa10 for kernel

commit 2c2fb7a8aa10e9ca7f2a49d426469ec89e3b267a
Merge: e5eb7036ac4f 42ec65b46a4f
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Tue Jun 23 17:32:24 2026 -0500

    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/iov.c
index 30ca4535fc36,fdae70abe804..b0d24839c084
--- a/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);
  	}
  }