From: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
To: Jisheng Zhang <Jisheng.Zhang@synaptics.com>,
Jingoo Han <jingoohan1@gmail.com>,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 4/5] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify the code
Date: Wed, 13 Mar 2019 10:37:59 +0000 [thread overview]
Message-ID: <3b1a5c1e-e458-20cf-51ce-1a7846ebf8c0@synopsys.com> (raw)
In-Reply-To: <20190301125901.5ee7730c@xhacker.debian>
Hi,
On 01/03/2019 05:06, Jisheng Zhang wrote:
> Use devm_pci_alloc_host_bridge() to simplify the error code path.
>
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
> ---
> .../pci/controller/dwc/pcie-designware-host.c | 21 +++++++------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> index 66569d0f3ab9..4831c12fee93 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> @@ -357,7 +357,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;
>
> @@ -368,7 +368,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) {
> @@ -412,8 +412,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;
> }
> }
>
> @@ -424,8 +423,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;
> }
> }
>
> @@ -435,8 +433,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;
> }
> }
>
> @@ -459,14 +456,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,
> @@ -475,7 +472,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;
> }
> }
>
> @@ -515,8 +512,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
> err_free_msi:
> if (IS_ENABLED(CONFIG_PCI_MSI) && !pp->ops->msi_host_init)
> dw_pcie_free_msi(pp);
> -error:
> - pci_free_host_bridge(bridge);
> return ret;
> }
>
>
Nice!
Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
next prev parent reply other threads:[~2019-03-13 10:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 5:02 [PATCH v2 0/5] PCI: dwc: Support remove Jisheng Zhang
2019-03-01 5:03 ` [PATCH v2 1/5] PCI: dwc: Fix dw_pcie_free_msi() if msi_irq is invalid Jisheng Zhang
2019-03-13 10:05 ` Gustavo Pimentel
2019-03-01 5:04 ` [PATCH v2 2/5] PCI: dwc: Free the page for MSI IRQ in dw_pcie_free_msi() Jisheng Zhang
2019-03-13 10:12 ` Gustavo Pimentel
2019-03-01 5:05 ` [PATCH v2 3/5] PCI: dwc: Free MSI in the error code path of dw_pcie_host_init() Jisheng Zhang
2019-03-13 10:24 ` Gustavo Pimentel
2019-03-01 5:06 ` [PATCH v2 4/5] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify the code Jisheng Zhang
2019-03-13 10:37 ` Gustavo Pimentel [this message]
2019-03-01 5:06 ` [PATCH v2 5/5] PCI: dwc: Save root bus for driver remove Jisheng Zhang
2019-03-13 10:33 ` Gustavo Pimentel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3b1a5c1e-e458-20cf-51ce-1a7846ebf8c0@synopsys.com \
--to=gustavo.pimentel@synopsys.com \
--cc=Jisheng.Zhang@synaptics.com \
--cc=bhelgaas@google.com \
--cc=jingoohan1@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).