PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code (e6fdd3bf) · Commits · 戴 / test

drivers/pci/controller/dwc/pcie-designware-host.c

+8 −13

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message