pinctrl: nomadik: use util function to reserve maps

Stop brewing our own pin map reservation function and use the
generic code.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 2 insertions, 23 deletions

diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index c093d75a022a..9fe31daf9230 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -32,6 +32,7 @@
 #include <linux/pinctrl/consumer.h>
 #include "pinctrl-nomadik.h"
 #include "../core.h"
+#include "../pinctrl-utils.h"
 
 /*
  * The GPIO module in the Nomadik family of Systems-on-Chip is an
@@ -1349,28 +1350,6 @@ static void nmk_pinctrl_dt_free_map(struct pinctrl_dev *pctldev,
         kfree(map);
 }
 
-static int nmk_dt_reserve_map(struct pinctrl_map **map, unsigned *reserved_maps,
-                unsigned *num_maps, unsigned reserve)
-{
-        unsigned old_num = *reserved_maps;
-        unsigned new_num = *num_maps + reserve;
-        struct pinctrl_map *new_map;
-
-        if (old_num >= new_num)
-                return 0;
-
-        new_map = krealloc(*map, sizeof(*new_map) * new_num, GFP_KERNEL);
-        if (!new_map)
-                return -ENOMEM;
-
-        memset(new_map + old_num, 0, (new_num - old_num) * sizeof(*new_map));
-
-        *map = new_map;
-        *reserved_maps = new_num;
-
-        return 0;
-}
-
 static int nmk_dt_add_map_mux(struct pinctrl_map **map, unsigned *reserved_maps,
                 unsigned *num_maps, const char *group,
                 const char *function)
@@ -1561,7 +1540,7 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
 
         reserve *= ret;
 
-        ret = nmk_dt_reserve_map(map, reserved_maps, num_maps, reserve);
+        ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps, reserve);
         if (ret < 0)
                 goto exit;