pinctrl: enhance reporting of errors when loading from DT

There are a few places in the api where the code simply returns -EINVAL when
it finds an error. An example is pinmux_map_to_setting() which now reports an
error if we try to match a group with a function that it does not support.

The reporting of errors in pinconf_check_ops and pinmux_check_ops now has the
same style and is located inside the according functions and not the calling
code.

When the map is found in the DT but the default state can not be selected we
get an error to know that the code at least tried.

The patch also removes a stray word from one comment and a "->" from another
for the sake of consistency.

Finally we replace a few pr_err/debug() calls with dev_err/dbg().

Thanks go to Stephen Warren for reviewing the patch and enhancing the reporting
inside pinmux_map_to_setting().

Signed-off-by: John Crispin <blogic@openwrt.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 27 insertions, 10 deletions

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 7cd0c7d0f2cf..2df753508eca 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -42,9 +42,10 @@ int pinmux_check_ops(struct pinctrl_dev *pctldev)
             !ops->get_function_name ||
             !ops->get_function_groups ||
             !ops->enable ||
-            !ops->disable)
+            !ops->disable) {
+                dev_err(pctldev->dev, "pinmux ops lacks necessary functions\n");
                 return -EINVAL;
-
+        }
         /* Check that all functions registered have names */
         nfuncs = ops->get_functions_count(pctldev);
         while (selector < nfuncs) {
@@ -143,7 +144,7 @@ static int pin_request(struct pinctrl_dev *pctldev,
                 status = 0;
 
         if (status) {
-                dev_err(pctldev->dev, "->request on device %s failed for pin %d\n",
+                dev_err(pctldev->dev, "request on device %s failed for pin %d\n",
                        pctldev->desc->name, pin);
                 module_put(pctldev->owner);
         }
@@ -330,17 +331,26 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
         }
 
         ret = pinmux_func_name_to_selector(pctldev, map->data.mux.function);
-        if (ret < 0)
+        if (ret < 0) {
+                dev_err(pctldev->dev, "invalid function %s in map table\n",
+                        map->data.mux.function);
                 return ret;
+        }
         setting->data.mux.func = ret;
 
         ret = pmxops->get_function_groups(pctldev, setting->data.mux.func,
                                           &groups, &num_groups);
-        if (ret < 0)
+        if (ret < 0) {
+                dev_err(pctldev->dev, "can't query groups for function %s\n",
+                        map->data.mux.function);
                 return ret;
-        if (!num_groups)
+        }
+        if (!num_groups) {
+                dev_err(pctldev->dev,
+                        "function %s can't be selected on any group\n",
+                        map->data.mux.function);
                 return -EINVAL;
-
+        }
         if (map->data.mux.group) {
                 bool found = false;
                 group = map->data.mux.group;
@@ -350,15 +360,22 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
                                 break;
                         }
                 }
-                if (!found)
+                if (!found) {
+                        dev_err(pctldev->dev,
+                                "invalid group \"%s\" for function \"%s\"\n",
+                                group, map->data.mux.function);
                         return -EINVAL;
+                }
         } else {
                 group = groups[0];
         }
 
         ret = pinctrl_get_group_selector(pctldev, group);
-        if (ret < 0)
+        if (ret < 0) {
+                dev_err(pctldev->dev, "invalid group %s in map table\n",
+                        map->data.mux.group);
                 return ret;
+        }
         setting->data.mux.group = ret;
 
         ret = pctlops->get_group_pins(pctldev, setting->data.mux.group, &pins,
@@ -375,7 +392,7 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
                 ret = pin_request(pctldev, pins[i], map->dev_name, NULL);
                 if (ret) {
                         dev_err(pctldev->dev,
-                                "could not get request pin %d on device %s\n",
+                                "could not request pin %d on device %s\n",
                                 pins[i], pinctrl_dev_get_name(pctldev));
                         /* On error release all taken pins */
                         i--; /* this pin just failed */