From: Ruiqiang Hao <ruiqiang....@windriver.com>
Commit 8b2ad28597b0 (Merge branch 'v5.15/standard/base' into v5.15/
standard/cn-sdkv5.4/octeon) introduced unpaired braces when dealing
with conflicts in file drivers/pci/pcie/portdrv_core.c. This causes
build issue below, fix by remove unnecessary brance.
drivers/pci/pcie/portdrv_core.c: In function 'get_port_device_capability':
drivers/pci/pcie/portdrv_core.c:279:12: error: invalid storage class for
function 'pcie_device_init'
279 | static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
| ^~~~~~~~~~~~~~~~
Signed-off-by: Ruiqiang Hao <ruiqiang....@windriver.com>
---
drivers/pci/pcie/portdrv_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 4f49243a7b28..c3ef406e263e 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -231,7 +231,7 @@ static int get_port_device_capability(struct pci_dev *dev)
*/
if (dev->aer_cap && pci_aer_available() &&
pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
- (pcie_ports_native || host->native_aer)) {
+ (pcie_ports_native || host->native_aer))
services |= PCIE_PORT_SERVICE_AER;
#endif
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11616):
https://lists.yoctoproject.org/g/linux-yocto/message/11616
Mute This Topic: https://lists.yoctoproject.org/mt/93365947/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
