]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI/MSI: Remove duplicated to_pci_dev() conversion
authorChris Li <chrisl@kernel.org>
Tue, 17 Jun 2025 23:57:30 +0000 (16:57 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 18 Jun 2025 18:50:04 +0000 (20:50 +0200)
In pci_msi_update_mask(), "lock = &to_pci_dev()" does the to_pci_dev()
lookup, and there's another one buried inside msi_desc_to_pci_dev().

Introduce a local variable to remove that duplication.

Signed-off-by: Chris Li <chrisl@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/all/20250617-pci-msi-avoid-dup-pcidev-v1-1-ed75b0419023@kernel.org
drivers/pci/msi/msi.c

index 6ede55a7c5e652c80b51b10e58f0290eb6556430..78bed2def9d870d645751436793238ef2bc8b3ed 100644 (file)
@@ -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);
 }