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, 3 insertions, 4 deletions

diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 6fe3232e798e..558aac554d09 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -782,16 +782,19 @@ spi on the second function mapping:
 static const struct pinctrl_map __initdata mapping[] = {
         {
                 .dev_name = "foo-spi.0",
+                .name = PINCTRL_STATE_DEFAULT,
                 .ctrl_dev_name = "pinctrl-foo",
                 .function = "spi0",
         },
         {
                 .dev_name = "foo-i2c.0",
+                .name = PINCTRL_STATE_DEFAULT,
                 .ctrl_dev_name = "pinctrl-foo",
                 .function = "i2c0",
         },
         {
                 .dev_name = "foo-mmc.0",
+                .name = PINCTRL_STATE_DEFAULT,
                 .ctrl_dev_name = "pinctrl-foo",
                 .function = "mmc0",
         },
@@ -944,10 +947,6 @@ foo_remove()
         pinctrl_put(state->p);
 }
 
-If you want to grab a specific control mapping and not just the first one
-found for this device you can specify a specific mapping name, for example in
-the above example the second i2c0 setting: pinctrl_get(&device, "spi0-pos-B");
-
 This get/enable/disable/put sequence can just as well be handled by bus drivers
 if you don't want each and every driver to handle it and you know the
 arrangement on your bus.