diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 12:52:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 12:52:06 -0700 |
| commit | 5623870d9b4f1b9bd4a8b75544f2f9ed2a49afff (patch) | |
| tree | 0cc4781e83de9180d9a604e8824674ef8a908d23 | |
| parent | 0db240bc077fd16cc16bcecfd7f4645bc474aa7e (diff) | |
| parent | 4a089c0b3f55b400689a5c35f7dfa0a74c363dae (diff) | |
Merge tag 'irq-msi-2025-07-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull MSI update from Thomas Gleixner:
"A trivial cleanup in the PCI/MSI code to remove a duplicated back and
forth conversion"
* tag 'irq-msi-2025-07-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
PCI/MSI: Remove duplicated to_pci_dev() conversion
| -rw-r--r-- | drivers/pci/msi/msi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index d686488f4111..8d8de0ad2bb7 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -113,7 +113,8 @@ static int pci_setup_msi_context(struct pci_dev *dev) void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set) { - raw_spinlock_t *lock = &to_pci_dev(desc->dev)->msi_lock; + struct pci_dev *dev = msi_desc_to_pci_dev(desc); + raw_spinlock_t *lock = &dev->msi_lock; unsigned long flags; if (!desc->pci.msi_attrib.can_mask) @@ -122,8 +123,7 @@ void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set) raw_spin_lock_irqsave(lock, flags); desc->pci.msi_mask &= ~clear; desc->pci.msi_mask |= set; - pci_write_config_dword(msi_desc_to_pci_dev(desc), desc->pci.mask_pos, - desc->pci.msi_mask); + pci_write_config_dword(dev, desc->pci.mask_pos, desc->pci.msi_mask); raw_spin_unlock_irqrestore(lock, flags); } |