pinctrl: ns2: rename pinctrl_utils_dt_free_map
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 May 2016 15:26:54 +0000 (17:26 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 9 May 2016 09:42:37 +0000 (11:42 +0200)
A conflict of two patches caused a build error when a function got renamed
but a new user appeared in the other patch:

drivers/pinctrl/bcm/pinctrl-ns2-mux.c:540:17: error: 'pinctrl_utils_dt_free_map' undeclared here (not in a function)
  .dt_free_map = pinctrl_utils_dt_free_map,
                 ^~~~~~~~~~~~~~~~~~~~~~~~~

This renames the new user of pinctrl_utils_dt_free_map accordingly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: d32f7fd3bbc3 ("pinctrl: Rename pinctrl_utils_dt_free_map to pinctrl_utils_free_map")
Fixes: b5aa1006e4a9 ("pinctrl: ns2: add pinmux driver support for Broadcom NS2 SoC")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/bcm/pinctrl-ns2-mux.c

index 1fd57db52d7bb08a775819a85ed21402910c52c9..3fefd14acc3eebf33323035eeb3211abb8482e44 100644 (file)
@@ -537,7 +537,7 @@ static struct pinctrl_ops ns2_pinctrl_ops = {
        .get_group_pins = ns2_get_group_pins,
        .pin_dbg_show = ns2_pin_dbg_show,
        .dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-       .dt_free_map = pinctrl_utils_dt_free_map,
+       .dt_free_map = pinctrl_utils_free_map,
 };
 
 static int ns2_get_functions_count(struct pinctrl_dev *pctrl_dev)