pinctrl: make pinctrl_register() return proper error code

Currently, pinctrl_register() just returns NULL on error, so the
callers can not know the exact reason of the failure.

Some of the pinctrl drivers return -EINVAL, some -ENODEV, and some
-ENOMEM on error of pinctrl_register(), although the error code
might be different from the real cause of the error.

This commit reworks pinctrl_register() to return the appropriate
error code and modifies all of the pinctrl drivers to use IS_ERR()
for the error checking and PTR_ERR() for getting the error code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Lee Jones <lee@kernel.org>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Ray Jui <rjui@broadcom.com>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Acked-by: Wei Chen <Wei.Chen@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm281xx.c b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
index 9641f1c7617eab98672f3e4a7136ca42af5c85ff..c3c692e508e8f90913018bd9052513e993c015db 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
@@ -1425,9 +1425,9 @@ static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev)
        pctl = pinctrl_register(&bcm281xx_pinctrl_desc,
                                &pdev->dev,
                                pdata);
-       if (!pctl) {
+       if (IS_ERR(pctl)) {
                dev_err(&pdev->dev, "Failed to register pinctrl\n");
-               return -ENODEV;
+               return PTR_ERR(pctl);
        }
 
        platform_set_drvdata(pdev, pdata);

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 8d908e3f42c3d1b89c4f9ac45c7566f00af8b317..efcf2a2b3975c2cc35fda3806223f0578900d4c2 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -1036,9 +1036,9 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
        }
 
        pc->pctl_dev = pinctrl_register(&bcm2835_pinctrl_desc, dev, pc);
-       if (!pc->pctl_dev) {
+       if (IS_ERR(pc->pctl_dev)) {
                gpiochip_remove(&pc->gpio_chip);
-               return -EINVAL;
+               return PTR_ERR(pc->pctl_dev);
        }
 
        pc->gpio_range = bcm2835_pinctrl_gpio_range;

diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
index bde45ba8d7107f8be7efdefc497f1012bc5a947c..6af538f67decd75898a4dfd671050a84a4b3fbe6 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c
@@ -748,9 +748,9 @@ static int cygnus_gpio_register_pinconf(struct cygnus_gpio *chip)
        pctldesc->confops = &cygnus_pconf_ops;
 
        chip->pctl = pinctrl_register(pctldesc, chip->dev, chip);
-       if (!chip->pctl) {
+       if (IS_ERR(chip->pctl)) {
                dev_err(chip->dev, "unable to register pinctrl device\n");
-               return -EINVAL;
+               return PTR_ERR(chip->pctl);
        }
 
        return 0;

diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-mux.c b/drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
index f9a9283caf8188fd39d9a4185fd7d2dea52e6ec7..9728f3db9126eabf2f858b9f7d7f14555fa6e3bf 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
@@ -989,9 +989,9 @@ static int cygnus_pinmux_probe(struct platform_device *pdev)
 
        pinctrl->pctl = pinctrl_register(&cygnus_pinctrl_desc, &pdev->dev,
                        pinctrl);
-       if (!pinctrl->pctl) {
+       if (IS_ERR(pinctrl->pctl)) {
                dev_err(&pdev->dev, "unable to register Cygnus IOMUX pinctrl\n");
-               return -EINVAL;
+               return PTR_ERR(pinctrl->pctl);
        }
 
        return 0;

diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
index 7f0b0f93242b7240198283896cce5276f29006f7..ddbcd1d7de5239e87ffb7df9d719221ea971dc7c 100644 (file)
--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -320,9 +320,9 @@ int berlin_pinctrl_probe(struct platform_device *pdev,
        }
 
        pctrl->pctrl_dev = pinctrl_register(&berlin_pctrl_desc, dev, pctrl);
-       if (!pctrl->pctrl_dev) {
+       if (IS_ERR(pctrl->pctrl_dev)) {
                dev_err(dev, "failed to register pinctrl driver\n");
-               return -EINVAL;
+               return PTR_ERR(pctrl->pctrl_dev);
        }
 
        return 0;

diff --cc drivers/pinctrl/core.c
Simple merge

diff --cc drivers/pinctrl/freescale/pinctrl-imx.c
Simple merge

diff --cc drivers/pinctrl/freescale/pinctrl-imx1-core.c
Simple merge

diff --cc drivers/pinctrl/freescale/pinctrl-mxs.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-cherryview.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-intel.c
Simple merge

diff --cc drivers/pinctrl/mediatek/pinctrl-mtk-common.c
Simple merge

diff --cc drivers/pinctrl/meson/pinctrl-meson.c
Simple merge

diff --cc drivers/pinctrl/mvebu/pinctrl-mvebu.c
Simple merge

diff --cc drivers/pinctrl/nomadik/pinctrl-abx500.c
Simple merge

diff --cc drivers/pinctrl/nomadik/pinctrl-nomadik.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-adi2.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-amd.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-as3722.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-at91.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-lantiq.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-lpc18xx.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-palmas.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-pistachio.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-rockchip.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-single.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-st.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tb10x.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tegra-xusb.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tegra.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tz1090-pdc.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tz1090.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-u300.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-zynq.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-msm.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
Simple merge

diff --cc drivers/pinctrl/samsung/pinctrl-exynos5440.c
Simple merge

diff --cc drivers/pinctrl/samsung/pinctrl-samsung.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pinctrl.c
Simple merge

diff --cc drivers/pinctrl/sirf/pinctrl-atlas7.c
Simple merge

diff --cc drivers/pinctrl/sirf/pinctrl-sirf.c
Simple merge

diff --cc drivers/pinctrl/spear/pinctrl-spear.c
Simple merge

diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
Simple merge

diff --cc drivers/pinctrl/vt8500/pinctrl-wmt.c
Simple merge