Merge branch 'pci/controller/dwc-nxp-s32g'

bjorn-helgaas · bjorn-helgaas · commit d375df113c91 · 2026-02-06T17:09:36.000-06:00
* pci/controller/dwc-nxp-s32g:
  PCI: s32g: Skip Root Port removal during success
diff --git a/drivers/pci/controller/dwc/pcie-nxp-s32g.c b/drivers/pci/controller/dwc/pcie-nxp-s32g.c
@@ -282,12 +282,12 @@ static int s32g_pcie_parse_ports(struct device *dev, struct s32g_pcie *s32g_pp)
 
 		ret = s32g_pcie_parse_port(s32g_pp, of_port);
 		if (ret)
-			goto err_port;
+			break;
 	}
 
-err_port:
-	list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
-		list_del(&port->list);
+	if (ret)
+		list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
+			list_del(&port->list);
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,12 @@ static int s32g_pcie_parse_ports(struct device dev, struct s32g_pcie s32g_pp)`
`282`	`282`
`283`	`283`	`ret = s32g_pcie_parse_port(s32g_pp, of_port);`
`284`	`284`	`if (ret)`
`285`		`- goto err_port;`
	`285`	`+ break;`
`286`	`286`	`}`
`287`	`287`
`288`		`-err_port:`
`289`		`- list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)`
`290`		`- list_del(&port->list);`
	`288`	`+ if (ret)`
	`289`	`+ list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)`
	`290`	`+ list_del(&port->list);`
`291`	`291`
`292`	`292`	`return ret;`
`293`	`293`	`}`