diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 44321d3..6727b92 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -217,7 +217,7 @@
 #include <linux/pinctrl/pinconf.h>
 #include "platform_x_pindefs.h"
 
-int foo_pin_config_get(struct pinctrl_dev *pctldev,
+static int foo_pin_config_get(struct pinctrl_dev *pctldev,
 		    unsigned offset,
 		    unsigned long *config)
 {
@@ -228,7 +228,7 @@
 	*config = (unsigned long) conf;
 }
 
-int foo_pin_config_set(struct pinctrl_dev *pctldev,
+static int foo_pin_config_set(struct pinctrl_dev *pctldev,
 		    unsigned offset,
 		    unsigned long config)
 {
@@ -241,14 +241,14 @@
 	}
 }
 
-int foo_pin_config_group_get (struct pinctrl_dev *pctldev,
+static int foo_pin_config_group_get (struct pinctrl_dev *pctldev,
 		    unsigned selector,
 		    unsigned long *config)
 {
 	...
 }
 
-int foo_pin_config_group_set (struct pinctrl_dev *pctldev,
+static int foo_pin_config_group_set (struct pinctrl_dev *pctldev,
 		    unsigned selector,
 		    unsigned long config)
 {
@@ -819,7 +819,7 @@
 0 for mapping, for example:
 
 static struct pinmux_map __initdata pmx_mapping[] = {
-       PINMUX_MAP_PRIMARY("I2CMAP", "i2c0", "foo-i2c.0"),
+       PINMUX_MAP("I2CMAP", "pinctrl-foo", "i2c0", "foo-i2c.0"),
 };
 
 
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 3bcc641..0916222 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -342,7 +342,7 @@
  * Only call this once during initialization of your machine, the function is
  * tagged as __init and won't be callable after init has completed. The map
  * passed into this function will be owned by the pinmux core and cannot be
- * free:d.
+ * freed.
  */
 int __init pinmux_register_mappings(struct pinmux_map const *maps,
 				    unsigned num_maps)