lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 29 Apr 2019 10:05:12 +0200 From: Bartosz Golaszewski <bgolaszewski@...libre.com> To: Andrey Smirnov <andrew.smirnov@...il.com> Cc: linux-gpio <linux-gpio@...r.kernel.org>, Linus Walleij <linus.walleij@...aro.org>, Chris Healy <cphealy@...il.com>, LKML <linux-kernel@...r.kernel.org> Subject: Re: [PATCH 2/2] gpio: vf610: Use PTR_ERR_OR_ZERO() in vf610_gpio_probe() pon., 29 kwi 2019 o 07:50 Andrey Smirnov <andrew.smirnov@...il.com> napisaĆ(a): > > Simplify error checking code by replacing multiple ERR macros with a > call to PTR_ERR_OR_ZERO. No functional change intended. > > Signed-off-by: Andrey Smirnov <andrew.smirnov@...il.com> > Cc: Linus Walleij <linus.walleij@...aro.org> > Cc: Bartosz Golaszewski <bgolaszewski@...libre.com> > Cc: Chris Healy <cphealy@...il.com> > Cc: linux-gpio@...r.kernel.org > Cc: linux-kernel@...r.kernel.org > --- > drivers/gpio/gpio-vf610.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c > index 30aef41e3b7e..7ba668db171b 100644 > --- a/drivers/gpio/gpio-vf610.c > +++ b/drivers/gpio/gpio-vf610.c > @@ -265,7 +265,8 @@ static int vf610_gpio_probe(struct platform_device *pdev) > return port->irq; > > port->clk_port = devm_clk_get(dev, "port"); > - if (!IS_ERR(port->clk_port)) { > + ret = PTR_ERR_OR_ZERO(port->clk_port); > + if (!ret) { > ret = clk_prepare_enable(port->clk_port); > if (ret) > return ret; > @@ -273,16 +274,17 @@ static int vf610_gpio_probe(struct platform_device *pdev) > port->clk_port); > if (ret) > return ret; > - } else if (port->clk_port == ERR_PTR(-EPROBE_DEFER)) { > + } else if (ret == -EPROBE_DEFER) { > /* > * Percolate deferrals, for anything else, > * just live without the clocking. > */ > - return PTR_ERR(port->clk_port); > + return ret; > } > > port->clk_gpio = devm_clk_get(dev, "gpio"); > - if (!IS_ERR(port->clk_gpio)) { > + ret = PTR_ERR_OR_ZERO(port->clk_gpio); > + if (!ret) { > ret = clk_prepare_enable(port->clk_gpio); > if (ret) > return ret; > @@ -290,8 +292,8 @@ static int vf610_gpio_probe(struct platform_device *pdev) > port->clk_gpio); > if (ret) > return ret; > - } else if (port->clk_gpio == ERR_PTR(-EPROBE_DEFER)) { > - return PTR_ERR(port->clk_gpio); > + } else if (ret == -EPROBE_DEFER) { > + return ret; > } > > gc = &port->gc; > -- > 2.20.1 > Reviewed-by: Bartosz Golaszewski <bgolaszewski@...libre.com>
Powered by blists - more mailing lists