Skip to content

Commit 5623870

Browse files
committed
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
2 parents 0db240b + 4a089c0 commit 5623870

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/pci/msi/msi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ static int pci_setup_msi_context(struct pci_dev *dev)
113113

114114
void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set)
115115
{
116-
raw_spinlock_t *lock = &to_pci_dev(desc->dev)->msi_lock;
116+
struct pci_dev *dev = msi_desc_to_pci_dev(desc);
117+
raw_spinlock_t *lock = &dev->msi_lock;
117118
unsigned long flags;
118119

119120
if (!desc->pci.msi_attrib.can_mask)
@@ -122,8 +123,7 @@ void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set)
122123
raw_spin_lock_irqsave(lock, flags);
123124
desc->pci.msi_mask &= ~clear;
124125
desc->pci.msi_mask |= set;
125-
pci_write_config_dword(msi_desc_to_pci_dev(desc), desc->pci.mask_pos,
126-
desc->pci.msi_mask);
126+
pci_write_config_dword(dev, desc->pci.mask_pos, desc->pci.msi_mask);
127127
raw_spin_unlock_irqrestore(lock, flags);
128128
}
129129

0 commit comments

Comments
 (0)