diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:24 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:24 -0500 |
| commit | 1a3465598e7501aa51a4088cd9b77627b821b33b (patch) | |
| tree | 3ad919542603156f5bbcf57daad287b44d20cb59 /drivers/pci | |
| parent | 8400291e289ee6b2bf9779ff1c83a291501f017b (diff) | |
| parent | 3ee1a6b5d78f07bc026f71ea0664d8df2a7d1280 (diff) | |
Merge branch 'pci/aer'
- Use PCI_DEVID() macro in aer_inject() instead of open-coding it (Jinjie
Ruan)
* pci/aer:
PCI/AER: Use PCI_DEVID() macro in aer_inject()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pcie/aer_inject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/aer_inject.c b/drivers/pci/pcie/aer_inject.c index f81b2303bf6a..91acc7b17f68 100644 --- a/drivers/pci/pcie/aer_inject.c +++ b/drivers/pci/pcie/aer_inject.c @@ -430,7 +430,7 @@ static int aer_inject(struct aer_error_inj *einj) else rperr->root_status |= PCI_ERR_ROOT_COR_RCV; rperr->source_id &= 0xffff0000; - rperr->source_id |= (einj->bus << 8) | devfn; + rperr->source_id |= PCI_DEVID(einj->bus, devfn); } if (einj->uncor_status) { if (rperr->root_status & PCI_ERR_ROOT_UNCOR_RCV) @@ -443,7 +443,7 @@ static int aer_inject(struct aer_error_inj *einj) rperr->root_status |= PCI_ERR_ROOT_NONFATAL_RCV; rperr->root_status |= PCI_ERR_ROOT_UNCOR_RCV; rperr->source_id &= 0x0000ffff; - rperr->source_id |= ((einj->bus << 8) | devfn) << 16; + rperr->source_id |= PCI_DEVID(einj->bus, devfn) << 16; } spin_unlock_irqrestore(&inject_lock, flags); |