Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5292d06 authored by Rob Herring's avatar Rob Herring Committed by Linus Walleij
Browse files

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: default avatarRob 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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
Acked-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 725e2221

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+11 −14
Original line number Diff line number Diff line
@@ -692,8 +692,7 @@ static int bcm2835_pctl_dt_node_to_map_func(struct bcm2835_pinctrl *pc, 
	struct pinctrl_map *map = *maps;



	if (fnum >= ARRAY_SIZE(bcm2835_functions)) {

		dev_err(pc->dev, "%s: invalid brcm,function %d\n",

			of_node_full_name(np), fnum);

		dev_err(pc->dev, "%pOF: invalid brcm,function %d\n", np, fnum);

		return -EINVAL;

	}
@@ -713,8 +712,7 @@ static int bcm2835_pctl_dt_node_to_map_pull(struct bcm2835_pinctrl *pc, 
	unsigned long *configs;



	if (pull > 2) {

		dev_err(pc->dev, "%s: invalid brcm,pull %d\n",

			of_node_full_name(np), pull);

		dev_err(pc->dev, "%pOF: invalid brcm,pull %d\n", np, pull);

		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);

	if (!pins) {

		dev_err(pc->dev, "%s: missing brcm,pins property\n",

				of_node_full_name(np));

		dev_err(pc->dev, "%pOF: missing brcm,pins property\n", np);

		return -EINVAL;

	}
@@ -755,8 +752,8 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, 


	if (!funcs && !pulls) {

		dev_err(pc->dev,

			"%s: neither brcm,function nor brcm,pull specified\n",

			of_node_full_name(np));

			"%pOF: neither brcm,function nor brcm,pull specified\n",

			np);

		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) {

		dev_err(pc->dev,

			"%s: brcm,function must have 1 or %d entries\n",

			of_node_full_name(np), num_pins);

			"%pOF: brcm,function must have 1 or %d entries\n",

			np, num_pins);

		return -EINVAL;

	}



	if (num_pulls > 1 && num_pulls != num_pins) {

		dev_err(pc->dev,

			"%s: brcm,pull must have 1 or %d entries\n",

			of_node_full_name(np), num_pins);

			"%pOF: brcm,pull must have 1 or %d entries\n",

			np, num_pins);

		return -EINVAL;

	}
@@ -793,8 +790,8 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, 
		if (err)

			goto out;

		if (pin >= ARRAY_SIZE(bcm2835_gpio_pins)) {

			dev_err(pc->dev, "%s: invalid brcm,pins value %d\n",

				of_node_full_name(np), pin);

			dev_err(pc->dev, "%pOF: invalid brcm,pins value %d\n",

				np, pin);

			err = -EINVAL;

			goto out;

		}

drivers/pinctrl/devicetree.c

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static int dt_to_map_one_config(struct pinctrl *p, 
	for (;;) {

		np_pctldev = of_get_next_parent(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",

				np_config->full_name);

			dev_info(p->dev, "could not find pctldev for node %pOF, deferring probe\n",

				np_config);

			of_node_put(np_pctldev);

			/* OK let's just assume this will appear later then */

			return -EPROBE_DEFER;

drivers/pinctrl/freescale/pinctrl-imx.c

+3 −5
Original line number Diff line number Diff line
@@ -461,16 +461,14 @@ static int imx_pinctrl_parse_groups(struct device_node *np, 
		list = of_get_property(np, "pinmux", &size);

		if (!list) {

			dev_err(info->dev,

				"no fsl,pins and pins property in node %s\n",

				np->full_name);

				"no fsl,pins and pins property in node %pOF\n", np);

			return -EINVAL;

		}

	}



	/* we do not check return since it's safe node passed down */

	if (!size || size % pin_size) {

		dev_err(info->dev, "Invalid fsl,pins or pins property in node %s\n",

			np->full_name);

		dev_err(info->dev, "Invalid fsl,pins or pins property in node %pOF\n", np);

		return -EINVAL;

	}
@@ -554,7 +552,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, 
	func->name = np->name;

	func->num_group_names = of_get_child_count(np);

	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;

	}

	func->group_names = devm_kcalloc(info->dev, func->num_group_names,

drivers/pinctrl/pinconf-generic.c

+3 −4
Original line number Diff line number Diff line
@@ -316,16 +316,15 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
	if (ret < 0) {

		/* EINVAL=missing, which is fine since it's optional */

		if (ret != -EINVAL)

			dev_err(dev, "%s: could not parse property function\n",

				of_node_full_name(np));

			dev_err(dev, "%pOF: could not parse property function\n",

				np);

		function = NULL;

	}



	ret = pinconf_generic_parse_dt_config(np, pctldev, &configs,

					      &num_configs);

	if (ret < 0) {

		dev_err(dev, "%s: could not parse node property\n",

			of_node_full_name(np));

		dev_err(dev, "%pOF: could not parse node property\n", np);

		return ret;

	}

drivers/pinctrl/pinctrl-at91-pio4.c

+5 −6
Original line number Diff line number Diff line
@@ -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,

					      &num_configs);

	if (ret < 0) {

		dev_err(pctldev->dev, "%s: could not parse node property\n",

			of_node_full_name(np));

		dev_err(pctldev->dev, "%pOF: could not parse node property\n",

			np);

		return ret;

	}
@@ -504,8 +504,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 


	num_pins = pins->length / sizeof(u32);

	if (!num_pins) {

		dev_err(pctldev->dev, "no pins found in node %s\n",

			of_node_full_name(np));

		dev_err(pctldev->dev, "no pins found in node %pOF\n", np);

		ret = -EINVAL;

		goto exit;

	}
@@ -584,8 +583,8 @@ static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, 


	if (ret < 0) {

		pinctrl_utils_free_map(pctldev, *map, *num_maps);

		dev_err(pctldev->dev, "can't create maps for node %s\n",

			np_config->full_name);

		dev_err(pctldev->dev, "can't create maps for node %pOF\n",

			np_config);

	}



	return ret;