p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pinctrl: Convert to using %pOF instead of full_name 

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Lee Jones <lee@kernel.org>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Barry Song <baohua@kernel.org>
Cc: linux-gpio@vger.kernel.org
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: kernel@stlinux.com
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Rob Herring 2017-07-18 16:43:23 -05:00 committed by Linus Walleij
parent 725e222141
commit f5292d06c4
10 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pinctrl/bcm/pinctrl-bcm2835.c
View File

@ -692,8 +692,7 @@ static int bcm2835_pctl_dt_node_to_map_func(struct bcm2835_pinctrl *pc,
struct pinctrl_map *map = *maps; struct pinctrl_map *map = *maps;
if (fnum >= ARRAY_SIZE(bcm2835_functions)) { if (fnum >= ARRAY_SIZE(bcm2835_functions)) {
dev_err(pc->dev, "%s: invalid brcm,function %d\n", dev_err(pc->dev, "%pOF: invalid brcm,function %d\n", np, fnum);
of_node_full_name(np), fnum);
return -EINVAL; return -EINVAL;
} }
@ -713,8 +712,7 @@ static int bcm2835_pctl_dt_node_to_map_pull(struct bcm2835_pinctrl *pc,
unsigned long *configs; unsigned long *configs;
if (pull > 2) { if (pull > 2) {
dev_err(pc->dev, "%s: invalid brcm,pull %d\n", dev_err(pc->dev, "%pOF: invalid brcm,pull %d\n", np, pull);
of_node_full_name(np), pull);
return -EINVAL; return -EINVAL;
} }
@ -745,8 +743,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
pins = of_find_property(np, "brcm,pins", NULL); pins = of_find_property(np, "brcm,pins", NULL);
if (!pins) { if (!pins) {
dev_err(pc->dev, "%s: missing brcm,pins property\n", dev_err(pc->dev, "%pOF: missing brcm,pins property\n", np);
of_node_full_name(np));
return -EINVAL; return -EINVAL;
} }
@ -755,8 +752,8 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (!funcs && !pulls) { if (!funcs && !pulls) {
dev_err(pc->dev, dev_err(pc->dev,
"%s: neither brcm,function nor brcm,pull specified\n", "%pOF: neither brcm,function nor brcm,pull specified\n",
of_node_full_name(np)); np);
return -EINVAL; return -EINVAL;
} }
@ -766,15 +763,15 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (num_funcs > 1 && num_funcs != num_pins) { if (num_funcs > 1 && num_funcs != num_pins) {
dev_err(pc->dev, dev_err(pc->dev,
"%s: brcm,function must have 1 or %d entries\n", "%pOF: brcm,function must have 1 or %d entries\n",
of_node_full_name(np), num_pins); np, num_pins);
return -EINVAL; return -EINVAL;
} }
if (num_pulls > 1 && num_pulls != num_pins) { if (num_pulls > 1 && num_pulls != num_pins) {
dev_err(pc->dev, dev_err(pc->dev,
"%s: brcm,pull must have 1 or %d entries\n", "%pOF: brcm,pull must have 1 or %d entries\n",
of_node_full_name(np), num_pins); np, num_pins);
return -EINVAL; return -EINVAL;
} }
@ -793,8 +790,8 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (err) if (err)
goto out; goto out;
if (pin >= ARRAY_SIZE(bcm2835_gpio_pins)) { if (pin >= ARRAY_SIZE(bcm2835_gpio_pins)) {
dev_err(pc->dev, "%s: invalid brcm,pins value %d\n", dev_err(pc->dev, "%pOF: invalid brcm,pins value %d\n",
of_node_full_name(np), pin); np, pin);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }

4
drivers/pinctrl/devicetree.c
View File

@ -117,8 +117,8 @@ static int dt_to_map_one_config(struct pinctrl *p,
for (;;) { for (;;) {
np_pctldev = of_get_next_parent(np_pctldev); np_pctldev = of_get_next_parent(np_pctldev);
if (!np_pctldev || of_node_is_root(np_pctldev)) { if (!np_pctldev || of_node_is_root(np_pctldev)) {
dev_info(p->dev, "could not find pctldev for node %s, deferring probe\n", dev_info(p->dev, "could not find pctldev for node %pOF, deferring probe\n",
np_config->full_name); np_config);
of_node_put(np_pctldev); of_node_put(np_pctldev);
/* OK let's just assume this will appear later then */ /* OK let's just assume this will appear later then */
return -EPROBE_DEFER; return -EPROBE_DEFER;

8
drivers/pinctrl/freescale/pinctrl-imx.c
View File

@ -461,16 +461,14 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
list = of_get_property(np, "pinmux", &size); list = of_get_property(np, "pinmux", &size);
if (!list) { if (!list) {
dev_err(info->dev, dev_err(info->dev,
"no fsl,pins and pins property in node %s\n", "no fsl,pins and pins property in node %pOF\n", np);
np->full_name);
return -EINVAL; return -EINVAL;
} }
} }
/* we do not check return since it's safe node passed down */ /* we do not check return since it's safe node passed down */
if (!size || size % pin_size) { if (!size || size % pin_size) {
dev_err(info->dev, "Invalid fsl,pins or pins property in node %s\n", dev_err(info->dev, "Invalid fsl,pins or pins property in node %pOF\n", np);
np->full_name);
return -EINVAL; return -EINVAL;
} }
@ -554,7 +552,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
func->name = np->name; func->name = np->name;
func->num_group_names = of_get_child_count(np); func->num_group_names = of_get_child_count(np);
if (func->num_group_names == 0) { if (func->num_group_names == 0) {
dev_err(info->dev, "no groups defined in %s\n", np->full_name); dev_err(info->dev, "no groups defined in %pOF\n", np);
return -EINVAL; return -EINVAL;
} }
func->group_names = devm_kcalloc(info->dev, func->num_group_names, func->group_names = devm_kcalloc(info->dev, func->num_group_names,

7
drivers/pinctrl/pinconf-generic.c
View File

@ -316,16 +316,15 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (ret < 0) { if (ret < 0) {
/* EINVAL=missing, which is fine since it's optional */ /* EINVAL=missing, which is fine since it's optional */
if (ret != -EINVAL) if (ret != -EINVAL)
dev_err(dev, "%s: could not parse property function\n", dev_err(dev, "%pOF: could not parse property function\n",
of_node_full_name(np)); np);
function = NULL; function = NULL;
} }
ret = pinconf_generic_parse_dt_config(np, pctldev, &configs, ret = pinconf_generic_parse_dt_config(np, pctldev, &configs,
&num_configs); &num_configs);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "%s: could not parse node property\n", dev_err(dev, "%pOF: could not parse node property\n", np);
of_node_full_name(np));
return ret; return ret;
} }

11
drivers/pinctrl/pinctrl-at91-pio4.c
View File

@ -494,8 +494,8 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
ret = pinconf_generic_parse_dt_config(np, pctldev, &configs, ret = pinconf_generic_parse_dt_config(np, pctldev, &configs,
&num_configs); &num_configs);
if (ret < 0) { if (ret < 0) {
dev_err(pctldev->dev, "%s: could not parse node property\n", dev_err(pctldev->dev, "%pOF: could not parse node property\n",
of_node_full_name(np)); np);
return ret; return ret;
} }
@ -504,8 +504,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
num_pins = pins->length / sizeof(u32); num_pins = pins->length / sizeof(u32);
if (!num_pins) { if (!num_pins) {
dev_err(pctldev->dev, "no pins found in node %s\n", dev_err(pctldev->dev, "no pins found in node %pOF\n", np);
of_node_full_name(np));
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
@ -584,8 +583,8 @@ static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (ret < 0) { if (ret < 0) {
pinctrl_utils_free_map(pctldev, *map, *num_maps); pinctrl_utils_free_map(pctldev, *map, *num_maps);
dev_err(pctldev->dev, "can't create maps for node %s\n", dev_err(pctldev->dev, "can't create maps for node %pOF\n",
np_config->full_name); np_config);
} }
return ret; return ret;

2
drivers/pinctrl/pinctrl-st.c
View File

@ -1537,7 +1537,7 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info,
return err; return err;
} }
} else { } else {
dev_info(dev, "No IRQ support for %s bank\n", np->full_name); dev_info(dev, "No IRQ support for %pOF bank\n", np);
} }
return 0; return 0;

4
drivers/pinctrl/pinctrl-tb10x.c
View File

@ -557,8 +557,8 @@ static int tb10x_dt_node_to_map(struct pinctrl_dev *pctl,
int ret = 0; int ret = 0;
if (of_property_read_string(np_config, "abilis,function", &string)) { if (of_property_read_string(np_config, "abilis,function", &string)) {
pr_err("%s: No abilis,function property in device tree.\n", pr_err("%pOF: No abilis,function property in device tree.\n",
np_config->full_name); np_config);
return -EINVAL; return -EINVAL;
} }

6
drivers/pinctrl/samsung/pinctrl-samsung.c
View File

@ -679,7 +679,7 @@ static int samsung_pinctrl_create_function(struct device *dev,
npins = of_property_count_strings(func_np, "samsung,pins"); npins = of_property_count_strings(func_np, "samsung,pins");
if (npins < 1) { if (npins < 1) {
dev_err(dev, "invalid pin list in %s node", func_np->name); dev_err(dev, "invalid pin list in %pOFn node", func_np);
return -EINVAL; return -EINVAL;
} }
@ -696,8 +696,8 @@ static int samsung_pinctrl_create_function(struct device *dev,
i, &gname); i, &gname);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"failed to read pin name %d from %s node\n", "failed to read pin name %d from %pOFn node\n",
i, func_np->name); i, func_np);
return ret; return ret;
} }

2
drivers/pinctrl/sh-pfc/pinctrl.c
View File

@ -290,7 +290,7 @@ static int sh_pfc_dt_node_to_map(struct pinctrl_dev *pctldev,
if (*num_maps) if (*num_maps)
return 0; return 0;
dev_err(dev, "no mapping found in node %s\n", np->full_name); dev_err(dev, "no mapping found in node %pOF\n", np);
ret = -EINVAL; ret = -EINVAL;
done: done:

6
drivers/pinctrl/sirf/pinctrl-sirf.c
View File

@ -810,7 +810,7 @@ static int sirfsoc_gpio_probe(struct device_node *np)
sgpio->chip.gc.set = sirfsoc_gpio_set_value; sgpio->chip.gc.set = sirfsoc_gpio_set_value;
sgpio->chip.gc.base = 0; sgpio->chip.gc.base = 0;
sgpio->chip.gc.ngpio = SIRFSOC_GPIO_BANK_SIZE * SIRFSOC_GPIO_NO_OF_BANKS; sgpio->chip.gc.ngpio = SIRFSOC_GPIO_BANK_SIZE * SIRFSOC_GPIO_NO_OF_BANKS;
sgpio->chip.gc.label = kstrdup(np->full_name, GFP_KERNEL); sgpio->chip.gc.label = kasprintf(GFP_KERNEL, "%pOF", np);
sgpio->chip.gc.of_node = np; sgpio->chip.gc.of_node = np;
sgpio->chip.gc.of_xlate = sirfsoc_gpio_of_xlate; sgpio->chip.gc.of_xlate = sirfsoc_gpio_of_xlate;
sgpio->chip.gc.of_gpio_n_cells = 2; sgpio->chip.gc.of_gpio_n_cells = 2;
@ -819,8 +819,8 @@ static int sirfsoc_gpio_probe(struct device_node *np)
err = gpiochip_add_data(&sgpio->chip.gc, sgpio); err = gpiochip_add_data(&sgpio->chip.gc, sgpio);
if (err) { if (err) {
dev_err(&pdev->dev, "%s: error in probe function with status %d\n", dev_err(&pdev->dev, "%pOF: error in probe function with status %d\n",
np->full_name, err); np, err);
goto out; goto out;
} }