2017-06-05 06:28:08

by Ryder Lee

Subject: [PATCH] PCI: mediatek: fix error handling in mtk_pcie_parse_and_add_res()

The 'linkup' variable would always increment by one whether the link
status is true or not. Therefore, this patch fixes the return value in
mtk_pcie_parse_and_add_res() and removes unnecessary 'linkup' variable.

Signed-off-by: Ryder Lee <[email protected]>
---
drivers/pci/host/pcie-mediatek.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index 8ec8fa8..3baafa8 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -373,7 +373,7 @@ static int mtk_pcie_parse_and_add_res(struct mtk_pcie *pcie)
struct of_pci_range_parser parser;
struct of_pci_range range;
struct resource res;
- int err, linkup = 0;
+ int err;

/* parse shared resources */
err = mtk_pcie_handle_shared_resource(pcie);
@@ -444,11 +444,11 @@ static int mtk_pcie_parse_and_add_res(struct mtk_pcie *pcie)

/* enable each port, and then check link status */
err = mtk_pcie_enable_ports(port);
- if (!err)
- linkup++;
+ if (err)
+ return err;
}

- return !linkup;
+ return 0;
}

static int mtk_pcie_request_resources(struct mtk_pcie *pcie)
--
1.9.1

2017-06-15 21:11:35

by Bjorn Helgaas

Subject: Re: [PATCH] PCI: mediatek: fix error handling in mtk_pcie_parse_and_add_res()

On Mon, Jun 05, 2017 at 02:27:58PM +0800, Ryder Lee wrote:
> The 'linkup' variable would always increment by one whether the link
> status is true or not. Therefore, this patch fixes the return value in
> mtk_pcie_parse_and_add_res() and removes unnecessary 'linkup' variable.
>
> Signed-off-by: Ryder Lee <[email protected]>

I folded this into pci/host-mediatek for v4.13, thanks!

I just noticed that we didn't get a MAINTAINERS update for this driver.
Can you send me that, too, please?

> ---
> drivers/pci/host/pcie-mediatek.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
> index 8ec8fa8..3baafa8 100644
> --- a/drivers/pci/host/pcie-mediatek.c
> +++ b/drivers/pci/host/pcie-mediatek.c
> @@ -373,7 +373,7 @@ static int mtk_pcie_parse_and_add_res(struct mtk_pcie *pcie)
> struct of_pci_range_parser parser;
> struct of_pci_range range;
> struct resource res;
> - int err, linkup = 0;
> + int err;
>
> /* parse shared resources */
> err = mtk_pcie_handle_shared_resource(pcie);
> @@ -444,11 +444,11 @@ static int mtk_pcie_parse_and_add_res(struct mtk_pcie *pcie)
>
> /* enable each port, and then check link status */
> err = mtk_pcie_enable_ports(port);
> - if (!err)
> - linkup++;
> + if (err)
> + return err;
> }
>
> - return !linkup;
> + return 0;
> }
>
> static int mtk_pcie_request_resources(struct mtk_pcie *pcie)
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel