git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From d32f7fd3bbc32732b094d938b95169521503a9fb Mon Sep 17 00:00:00 2001
   2 From: Irina Tirdea <irina.tirdea@intel.com>
   3 Date: Thu, 31 Mar 2016 14:44:42 +0300
   4 Subject: [PATCH] pinctrl: Rename pinctrl_utils_dt_free_map to
   5  pinctrl_utils_free_map
   6
   7 Rename pinctrl_utils_dt_free_map to pinctrl_utils_free_map, since
   8 it does not depend on device tree despite the current name. This
   9 will enforce a consistent naming in pinctr-utils.c and will make
  10 it clear it can be called from outside device tree (e.g. from
  11 ACPI handling code).
  12
  13 Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
  14 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  15 ---
  16  drivers/pinctrl/pinconf-generic.c                | 2 +-
  17  drivers/pinctrl/pinctrl-utils.c                  | 4 ++--
  18  drivers/pinctrl/pinctrl-utils.h                  | 2 +-
  19  3 files changed, 4 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/pinctrl/pinconf-generic.c
  22 +++ b/drivers/pinctrl/pinconf-generic.c
  23 @@ -385,7 +385,7 @@ int pinconf_generic_dt_node_to_map(struc
  24         return 0;
  25
  26  exit:
  27 -       pinctrl_utils_dt_free_map(pctldev, *map, *num_maps);
  28 +       pinctrl_utils_free_map(pctldev, *map, *num_maps);
  29         return ret;
  30  }
  31  EXPORT_SYMBOL_GPL(pinconf_generic_dt_node_to_map);
  32 --- a/drivers/pinctrl/pinctrl-utils.c
  33 +++ b/drivers/pinctrl/pinctrl-utils.c
  34 @@ -122,7 +122,7 @@ int pinctrl_utils_add_config(struct pinc
  35  }
  36  EXPORT_SYMBOL_GPL(pinctrl_utils_add_config);
  37
  38 -void pinctrl_utils_dt_free_map(struct pinctrl_dev *pctldev,
  39 +void pinctrl_utils_free_map(struct pinctrl_dev *pctldev,
  40               struct pinctrl_map *map, unsigned num_maps)
  41  {
  42         int i;
  43 @@ -139,4 +139,4 @@ void pinctrl_utils_dt_free_map(struct pi
  44         }
  45         kfree(map);
  46  }
  47 -EXPORT_SYMBOL_GPL(pinctrl_utils_dt_free_map);
  48 +EXPORT_SYMBOL_GPL(pinctrl_utils_free_map);
  49 --- a/drivers/pinctrl/pinctrl-utils.h
  50 +++ b/drivers/pinctrl/pinctrl-utils.h
  51 @@ -37,7 +37,7 @@ int pinctrl_utils_add_map_configs(struct
  52  int pinctrl_utils_add_config(struct pinctrl_dev *pctldev,
  53                 unsigned long **configs, unsigned *num_configs,
  54                 unsigned long config);
  55 -void pinctrl_utils_dt_free_map(struct pinctrl_dev *pctldev,
  56 +void pinctrl_utils_free_map(struct pinctrl_dev *pctldev,
  57                 struct pinctrl_map *map, unsigned num_maps);
  58
  59  #endif /* __PINCTRL_UTILS_H__ */