aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-08-24 17:12:27 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-09-14 03:13:43 -0400
commit5a99233e9bcacc7ea23e173a75bbb7301abd3e6f (patch)
tree6e1f5abce967ba82a243ff328bcdf0b824b06466
parentd259ec26a6c541a5437e9ed0a1e1891342af3cff (diff)
pinctrl: digicolor: convert null test to IS_ERR test
Since commit 323de9efdf3e ("pinctrl: make pinctrl_register() return proper error code"), pinctrl_register returns an error code rather than NULL on failure. Update a driver that was introduced more recently. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e,e1,e2; @@ e = pinctrl_register(...) ... when != e = e1 if ( - e == NULL + IS_ERR(e) ) { ... return - e2 + PTR_ERR(e) ; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Acked-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-digicolor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index 461fffc4c62a..11f8b835d3b6 100644
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -337,9 +337,9 @@ static int dc_pinctrl_probe(struct platform_device *pdev)
337 pmap->dev = &pdev->dev; 337 pmap->dev = &pdev->dev;
338 338
339 pmap->pctl = pinctrl_register(pctl_desc, &pdev->dev, pmap); 339 pmap->pctl = pinctrl_register(pctl_desc, &pdev->dev, pmap);
340 if (!pmap->pctl) { 340 if (IS_ERR(pmap->pctl)) {
341 dev_err(&pdev->dev, "pinctrl driver registration failed\n"); 341 dev_err(&pdev->dev, "pinctrl driver registration failed\n");
342 return -EINVAL; 342 return PTR_ERR(pmap->pctl);
343 } 343 }
344 344
345 ret = dc_gpiochip_add(pmap, pdev->dev.of_node); 345 ret = dc_gpiochip_add(pmap, pdev->dev.of_node);