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

pinctrl: Convert to using %pOFn instead of device_node.name 



In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Dong Aisheng <aisheng.dong@nxp.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-gpio@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Acked-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarSean Wang <sean.wang@mediatek.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 803ceb29

drivers/pinctrl/berlin/berlin.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -64,16 +64,14 @@ static int berlin_pinctrl_dt_node_to_map(struct pinctrl_dev *pctrl_dev, 
	ret = of_property_read_string(node, "function", &function_name);

	ret = of_property_read_string(node, "function", &function_name);

	if (ret) {

	if (ret) {

		dev_err(pctrl->dev,

		dev_err(pctrl->dev,

			"missing function property in node %s\n",

			"missing function property in node %pOFn\n", node);

			node->name);

		return -EINVAL;

		return -EINVAL;

	}

	}





	ngroups = of_property_count_strings(node, "groups");

	ngroups = of_property_count_strings(node, "groups");

	if (ngroups < 0) {

	if (ngroups < 0) {

		dev_err(pctrl->dev,

		dev_err(pctrl->dev,

			"missing groups property in node %s\n",

			"missing groups property in node %pOFn\n", node);

			node->name);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/pinctrl/freescale/pinctrl-imx.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -69,8 +69,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, 
	 */

	 */

	grp = imx_pinctrl_find_group_by_name(pctldev, np->name);

	grp = imx_pinctrl_find_group_by_name(pctldev, np->name);

	if (!grp) {

	if (!grp) {

		dev_err(ipctl->dev, "unable to find group for node %s\n",

		dev_err(ipctl->dev, "unable to find group for node %pOFn\n", np);

			np->name);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -434,7 +433,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np, 
	int i;

	int i;

	u32 config;

	u32 config;





	dev_dbg(ipctl->dev, "group(%d): %s\n", index, np->name);

	dev_dbg(ipctl->dev, "group(%d): %pOFn\n", index, np);





	if (info->flags & SHARE_MUX_CONF_REG)

	if (info->flags & SHARE_MUX_CONF_REG)

		pin_size = FSL_PIN_SHARE_SIZE;

		pin_size = FSL_PIN_SHARE_SIZE;
@@ -544,7 +543,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, 
	struct group_desc *grp;

	struct group_desc *grp;

	u32 i = 0;

	u32 i = 0;





	dev_dbg(pctl->dev, "parse function(%d): %s\n", index, np->name);

	dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np);





	func = pinmux_generic_get_function(pctl, index);

	func = pinmux_generic_get_function(pctl, index);

	if (!func)

	if (!func)

drivers/pinctrl/freescale/pinctrl-imx1-core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -233,8 +233,8 @@ static int imx1_dt_node_to_map(struct pinctrl_dev *pctldev, 
	 */

	 */

	grp = imx1_pinctrl_find_group_by_name(info, np->name);

	grp = imx1_pinctrl_find_group_by_name(info, np->name);

	if (!grp) {

	if (!grp) {

		dev_err(info->dev, "unable to find group for node %s\n",

		dev_err(info->dev, "unable to find group for node %pOFn\n",

			np->name);

			np);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -466,7 +466,7 @@ static int imx1_pinctrl_parse_groups(struct device_node *np, 
	const __be32 *list;

	const __be32 *list;

	int i;

	int i;





	dev_dbg(info->dev, "group(%d): %s\n", index, np->name);

	dev_dbg(info->dev, "group(%d): %pOFn\n", index, np);





	/* Initialise group */

	/* Initialise group */

	grp->name = np->name;

	grp->name = np->name;
@@ -477,8 +477,8 @@ static int imx1_pinctrl_parse_groups(struct device_node *np, 
	list = of_get_property(np, "fsl,pins", &size);

	list = of_get_property(np, "fsl,pins", &size);

	/* 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 % 12) {

	if (!size || size % 12) {

		dev_notice(info->dev, "Not a valid fsl,pins property (%s)\n",

		dev_notice(info->dev, "Not a valid fsl,pins property (%pOFn)\n",

				np->name);

				np);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -513,7 +513,7 @@ static int imx1_pinctrl_parse_functions(struct device_node *np, 
	static u32 grp_index;

	static u32 grp_index;

	u32 i = 0;

	u32 i = 0;





	dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name);

	dev_dbg(info->dev, "parse function(%d): %pOFn\n", index, np);





	func = &info->functions[index];

	func = &info->functions[index];

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -514,8 +514,8 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 




	pins = of_find_property(node, "pinmux", NULL);

	pins = of_find_property(node, "pinmux", NULL);

	if (!pins) {

	if (!pins) {

		dev_err(pctl->dev, "missing pins property in node %s .\n",

		dev_err(pctl->dev, "missing pins property in node %pOFn .\n",

				node->name);

				node);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/pinctrl/meson/pinctrl-meson.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ static struct regmap *meson_map_resource(struct meson_pinctrl *pc, 




	meson_regmap_config.max_register = resource_size(&res) - 4;

	meson_regmap_config.max_register = resource_size(&res) - 4;

	meson_regmap_config.name = devm_kasprintf(pc->dev, GFP_KERNEL,

	meson_regmap_config.name = devm_kasprintf(pc->dev, GFP_KERNEL,

						  "%s-%s", node->name,

						  "%pOFn-%s", node,

						  name);

						  name);

	if (!meson_regmap_config.name)

	if (!meson_regmap_config.name)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);