FAILED: patch "[PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code" failed to apply to 5.0-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e6fdd3bf5aecd8615f31a5128775b9abcf3e0d86 Mon Sep 17 00:00:00 2001
From: Jisheng Zhang <[email protected]>
Date: Fri, 29 Mar 2019 11:58:53 +0000
Subject: [PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code
Use devm_pci_alloc_host_bridge() to simplify the error code path. This also fixes a leak in the dw_pcie_host_init() error path.
Signed-off-by Jisheng Zhang <[email protected]>
Signed-off-by Lorenzo Pieralisi <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
Acked-by Gustavo Pimentel <[email protected]>
CC [email protected] # v4.13+
drivers/pci/controller/dwc/pcie-designware-host.c +8 -13
@@ -358,7 +358,7 @@ int dw_pcie_host_init(struct pcie_port *pp)dev_err (dev,"Missing *config* reg space\n" ); } - bridge =pci_alloc_host_bridge (0 ); + bridge =devm_pci_alloc_host_bridge (dev,0 );if (!bridge)return -ENOMEM ;
@@ -369,7 +369,7 @@ int dw_pcie_host_init(struct pcie_port *pp) ret =devm_request_pci_bus_resources (dev, &bridge->windows);if (ret) - goto error; +return ret;/* Get the I/O and memory ranges from DT */ resource_list_for_each_entry_safe (win, tmp, &bridge->windows) {
@@ -413,8 +413,7 @@ int dw_pcie_host_init(struct pcie_port *pp) resource_size(pp->cfg));if (!pci->dbi_base) {dev_err (dev,"Error with ioremap\n" ); - ret = -ENOMEM ; - goto error; +return -ENOMEM ; } }
@@ -425,8 +424,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base, pp->cfg0_size);if (!pp->va_cfg0_base) {dev_err (dev,"Error with ioremap in function\n" ); - ret = -ENOMEM ; - goto error; +return -ENOMEM ; } }
@@ -436,8 +434,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg1_size);if (!pp->va_cfg1_base) {dev_err (dev,"Error with ioremap\n" ); - ret = -ENOMEM ; - goto error; +return -ENOMEM ; } }
@@ -460,14 +457,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->num_vectors == 0) {dev_err (dev,"Invalid number of vectors\n" ); - goto error; +return -EINVAL ; } }if (!pp->ops->msi_host_init) { ret =dw_pcie_allocate_domains (pp);if (ret) - goto error; +return ret;if (pp->msi_irq) irq_set_chained_handler_and_data(pp->msi_irq,
@@ -476,7 +473,7 @@ int dw_pcie_host_init(struct pcie_port *pp) }else { ret = pp->ops->msi_host_init (pp);if (ret <0 ) - goto error; +return ret; } }
@@ -516,8 +513,6 @@ int dw_pcie_host_init(struct pcie_port *pp) err_free_msi:if (pci_msi_enabled () && !pp->ops->msi_host_init)dw_pcie_free_msi (pp); -error: -pci_free_host_bridge (bridge);return ret; }