github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

A trivial cleanup in the PCI/MSI code to remove a duplicated back and forth

Browse Source 
conversion.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEQp8+kY+LLUocC4bMphj1TA10mKEFAmiGkAoTHHRnbHhAbGlu
 dXRyb25peC5kZQAKCRCmGPVMDXSYoZ6QD/9GcePrHCYWTVrvz3IwiXlND04BdTgI
 azzQpPFlQPahaqhUCBJ7kVkWSFUHXAOzfrhOvKLTjpkSpLyrT4+Lhw6xX2Zpn5ap
 Twks9pAd5DK55W/MXjGu+CZpKtO0vWbKRSofINRdBtBhgULfxy9jgHoAmmV7Ksns
 b2LCK4Zwkf6MIw8RZYXlOaDRdopDg5qjdTnIQgv/kJogE5Ee40h4h1VZLn0LwQrE
 vlLB9A3IlbrVUZeTbRfVETb+nkLvwn9OcpMaTv6AIJHYjAA1S+mMvx4ZC+vCpQG/
 i0XIVrkKoj3RVnI76PqYIu5+gdAGiMCjE5gjSAjxxYmf87908daRGGurvePAZear
 rCLsurwFLqBT9xlHXLonSmjLpA8gxcNjAi/kNa+2PdWDnyuXafuNqZshykedUKzx
 nahnbt0ssgOySgV5CGSxyqRtDZIF2tYEemFBZ7+z3Al9HDcvQEFLta7G0dWRKk6i
 sV5U60RwdcdG/M1iHJbqLuIJZ+B97Na1j3Hssn6yoijWTAU+q6VSFOeO0DkfGM75
 ZPozM720KFD4cYxaw84siaonAqZ7IgOjwMzT5m5TnsuxY8AHRNLATrR8LkhLl33w
 9FkJjp6Xl3cAWCWsXEf4kUGRbUf7GpFu8jJoI1bi9gi9AJz5CvA/fC4w3hfOToCg
 H2WGQ/DZMsudPg==
 =k2FW
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-07-29 12:52:06 -07:00
commit 5623870d9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/msi/msi.c
View 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);
}