PCI/AER: Use PCI_DEVID() macro in aer_inject()
authorJinjie Ruan <ruanjinjie@huawei.com>
Thu, 29 Aug 2024 02:24:35 +0000 (10:24 +0800)
committerKrzysztof Wilczyński <kwilczynski@kernel.org>
Sun, 1 Sep 2024 17:05:45 +0000 (17:05 +0000)
The PCI_DEVID() macro can be used instead of open-coding it.

No functional changes intended.

Link: https://lore.kernel.org/linux-pci/20240829022435.4145181-1-ruanjinjie@huawei.com
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
[kwilczynski: commit log]
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
drivers/pci/pcie/aer_inject.c

index f81b2303bf6a0463f80cc68b4d8dfe7d924d5d80..91acc7b17f68548354cbc8434a75738390757da7 100644 (file)
@@ -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);