diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-08-24 17:12:26 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-09-14 03:13:43 -0400 |
commit | d259ec26a6c541a5437e9ed0a1e1891342af3cff (patch) | |
tree | 7d646fd9d952f732f3587cff17672da327bcfa39 /drivers/pinctrl/qcom | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) |
pinctrl: qcom: ssbi: 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 some drivers that were 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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/qcom')
-rw-r--r-- | drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c index c978b311031b..e1a3721bc8e5 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | |||
@@ -723,9 +723,9 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev) | |||
723 | #endif | 723 | #endif |
724 | 724 | ||
725 | pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl); | 725 | pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl); |
726 | if (!pctrl->pctrl) { | 726 | if (IS_ERR(pctrl->pctrl)) { |
727 | dev_err(&pdev->dev, "couldn't register pm8xxx gpio driver\n"); | 727 | dev_err(&pdev->dev, "couldn't register pm8xxx gpio driver\n"); |
728 | return -ENODEV; | 728 | return PTR_ERR(pctrl->pctrl); |
729 | } | 729 | } |
730 | 730 | ||
731 | pctrl->chip = pm8xxx_gpio_template; | 731 | pctrl->chip = pm8xxx_gpio_template; |
diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c index 2d1b69f171be..6652b8d7f707 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | |||
@@ -814,9 +814,9 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) | |||
814 | #endif | 814 | #endif |
815 | 815 | ||
816 | pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl); | 816 | pctrl->pctrl = pinctrl_register(&pctrl->desc, &pdev->dev, pctrl); |
817 | if (!pctrl->pctrl) { | 817 | if (IS_ERR(pctrl->pctrl)) { |
818 | dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n"); | 818 | dev_err(&pdev->dev, "couldn't register pm8xxx mpp driver\n"); |
819 | return -ENODEV; | 819 | return PTR_ERR(pctrl->pctrl); |
820 | } | 820 | } |
821 | 821 | ||
822 | pctrl->chip = pm8xxx_mpp_template; | 822 | pctrl->chip = pm8xxx_mpp_template; |