pinctrl: assume map table entries can't have a NULL name field

pinctrl_register_mappings() already requires that every mapping table
entry have a non-NULL name field.

Logically, this makes sense too; drivers should always request a specific
named state so they know what they're getting. Relying on getting the
first mentioned state in the mapping table is error-prone, and a nasty
special case to implement, given that a given the mapping table may define
multiple states for a device.

Remove a small part of the documentation that talked about optionally
requesting a specific state; it's mandatory now.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index f25307b0e00a..6af6d8d117df 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -461,8 +461,8 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name)
         int i;
         struct pinctrl_map const *map;
 
-        /* We must have a dev name */
-        if (WARN_ON(!dev))
+        /* We must have both a dev and state name */
+        if (WARN_ON(!dev || !name))
                 return ERR_PTR(-EINVAL);
 
         devname = dev_name(dev);
@@ -504,16 +504,9 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev, const char *name)
                 if (strcmp(map->dev_name, devname))
                         continue;
 
-                /*
-                 * If we're looking for a specific named map, this must match,
-                 * else we loop and look for the next.
-                 */
-                if (name != NULL) {
-                        if (map->name == NULL)
-                                continue;
-                        if (strcmp(map->name, name))
-                                continue;
-                }
+                /* State name must be the one we're looking for */
+                if (strcmp(map->name, name))
+                        continue;
 
                 ret = pinmux_apply_muxmap(pctldev, p, dev, devname, map);
                 if (ret) {