2020-09-21 13:12:59

by Qinglang Miao

[permalink] [raw]
Subject: [PATCH -next] PCI: loongson: simplify the return expression of loongson_pci_probe()

Simplify the return expression.

Signed-off-by: Qinglang Miao <[email protected]>
---
drivers/pci/controller/pci-loongson.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pci-loongson.c b/drivers/pci/controller/pci-loongson.c
index 719c19fe2..48169b1e3 100644
--- a/drivers/pci/controller/pci-loongson.c
+++ b/drivers/pci/controller/pci-loongson.c
@@ -183,7 +183,6 @@ static int loongson_pci_probe(struct platform_device *pdev)
struct device_node *node = dev->of_node;
struct pci_host_bridge *bridge;
struct resource *regs;
- int err;

if (!node)
return -ENODEV;
@@ -222,11 +221,7 @@ static int loongson_pci_probe(struct platform_device *pdev)
bridge->ops = &loongson_pci_ops;
bridge->map_irq = loongson_map_irq;

- err = pci_host_probe(bridge);
- if (err)
- return err;
-
- return 0;
+ return pci_host_probe(bridge);
}

static struct platform_driver loongson_pci_driver = {
--
2.23.0


2020-10-01 14:41:59

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH -next] PCI: loongson: simplify the return expression of loongson_pci_probe()

On Mon, 21 Sep 2020 21:10:54 +0800, Qinglang Miao wrote:
> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> drivers/pci/controller/pci-loongson.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>

Reviewed-by: Rob Herring <[email protected]>

2020-10-02 12:02:22

by Lorenzo Pieralisi

[permalink] [raw]
Subject: Re: [PATCH -next] PCI: loongson: simplify the return expression of loongson_pci_probe()

On Mon, Sep 21, 2020 at 09:10:54PM +0800, Qinglang Miao wrote:
> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> drivers/pci/controller/pci-loongson.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)

Applied to pci/loongson, thanks.

Lorenzo

> diff --git a/drivers/pci/controller/pci-loongson.c b/drivers/pci/controller/pci-loongson.c
> index 719c19fe2..48169b1e3 100644
> --- a/drivers/pci/controller/pci-loongson.c
> +++ b/drivers/pci/controller/pci-loongson.c
> @@ -183,7 +183,6 @@ static int loongson_pci_probe(struct platform_device *pdev)
> struct device_node *node = dev->of_node;
> struct pci_host_bridge *bridge;
> struct resource *regs;
> - int err;
>
> if (!node)
> return -ENODEV;
> @@ -222,11 +221,7 @@ static int loongson_pci_probe(struct platform_device *pdev)
> bridge->ops = &loongson_pci_ops;
> bridge->map_irq = loongson_map_irq;
>
> - err = pci_host_probe(bridge);
> - if (err)
> - return err;
> -
> - return 0;
> + return pci_host_probe(bridge);
> }
>
> static struct platform_driver loongson_pci_driver = {
> --
> 2.23.0
>