Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Sean Wang <sean.wang@mediatek.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Rob Herring and committed by
Linus Walleij
94f4e54c 803ceb29

+66 -69
+2 -4
drivers/pinctrl/berlin/berlin.c
··· 64 64 ret = of_property_read_string(node, "function", &function_name); 65 65 if (ret) { 66 66 dev_err(pctrl->dev, 67 - "missing function property in node %s\n", 68 - node->name); 67 + "missing function property in node %pOFn\n", node); 69 68 return -EINVAL; 70 69 } 71 70 72 71 ngroups = of_property_count_strings(node, "groups"); 73 72 if (ngroups < 0) { 74 73 dev_err(pctrl->dev, 75 - "missing groups property in node %s\n", 76 - node->name); 74 + "missing groups property in node %pOFn\n", node); 77 75 return -EINVAL; 78 76 } 79 77
+3 -4
drivers/pinctrl/freescale/pinctrl-imx.c
··· 69 69 */ 70 70 grp = imx_pinctrl_find_group_by_name(pctldev, np->name); 71 71 if (!grp) { 72 - dev_err(ipctl->dev, "unable to find group for node %s\n", 73 - np->name); 72 + dev_err(ipctl->dev, "unable to find group for node %pOFn\n", np); 74 73 return -EINVAL; 75 74 } 76 75 ··· 433 434 int i; 434 435 u32 config; 435 436 436 - dev_dbg(ipctl->dev, "group(%d): %s\n", index, np->name); 437 + dev_dbg(ipctl->dev, "group(%d): %pOFn\n", index, np); 437 438 438 439 if (info->flags & SHARE_MUX_CONF_REG) 439 440 pin_size = FSL_PIN_SHARE_SIZE; ··· 543 544 struct group_desc *grp; 544 545 u32 i = 0; 545 546 546 - dev_dbg(pctl->dev, "parse function(%d): %s\n", index, np->name); 547 + dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np); 547 548 548 549 func = pinmux_generic_get_function(pctl, index); 549 550 if (!func)
+6 -6
drivers/pinctrl/freescale/pinctrl-imx1-core.c
··· 233 233 */ 234 234 grp = imx1_pinctrl_find_group_by_name(info, np->name); 235 235 if (!grp) { 236 - dev_err(info->dev, "unable to find group for node %s\n", 237 - np->name); 236 + dev_err(info->dev, "unable to find group for node %pOFn\n", 237 + np); 238 238 return -EINVAL; 239 239 } 240 240 ··· 466 466 const __be32 *list; 467 467 int i; 468 468 469 - dev_dbg(info->dev, "group(%d): %s\n", index, np->name); 469 + dev_dbg(info->dev, "group(%d): %pOFn\n", index, np); 470 470 471 471 /* Initialise group */ 472 472 grp->name = np->name; ··· 477 477 list = of_get_property(np, "fsl,pins", &size); 478 478 /* we do not check return since it's safe node passed down */ 479 479 if (!size || size % 12) { 480 - dev_notice(info->dev, "Not a valid fsl,pins property (%s)\n", 481 - np->name); 480 + dev_notice(info->dev, "Not a valid fsl,pins property (%pOFn)\n", 481 + np); 482 482 return -EINVAL; 483 483 } 484 484 ··· 513 513 static u32 grp_index; 514 514 u32 i = 0; 515 515 516 - dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name); 516 + dev_dbg(info->dev, "parse function(%d): %pOFn\n", index, np); 517 517 518 518 func = &info->functions[index]; 519 519
+2 -2
drivers/pinctrl/mediatek/pinctrl-mtk-common.c
··· 514 514 515 515 pins = of_find_property(node, "pinmux", NULL); 516 516 if (!pins) { 517 - dev_err(pctl->dev, "missing pins property in node %s .\n", 518 - node->name); 517 + dev_err(pctl->dev, "missing pins property in node %pOFn .\n", 518 + node); 519 519 return -EINVAL; 520 520 } 521 521
+1 -1
drivers/pinctrl/meson/pinctrl-meson.c
··· 451 451 452 452 meson_regmap_config.max_register = resource_size(&res) - 4; 453 453 meson_regmap_config.name = devm_kasprintf(pc->dev, GFP_KERNEL, 454 - "%s-%s", node->name, 454 + "%pOFn-%s", node, 455 455 name); 456 456 if (!meson_regmap_config.name) 457 457 return ERR_PTR(-ENOMEM);
+2 -2
drivers/pinctrl/mvebu/pinctrl-mvebu.c
··· 413 413 ret = of_property_read_string(np, "marvell,function", &function); 414 414 if (ret) { 415 415 dev_err(pctl->dev, 416 - "missing marvell,function in node %s\n", np->name); 416 + "missing marvell,function in node %pOFn\n", np); 417 417 return 0; 418 418 } 419 419 420 420 nmaps = of_property_count_strings(np, "marvell,pins"); 421 421 if (nmaps < 0) { 422 422 dev_err(pctl->dev, 423 - "missing marvell,pins in node %s\n", np->name); 423 + "missing marvell,pins in node %pOFn\n", np); 424 424 return 0; 425 425 } 426 426
+3 -3
drivers/pinctrl/nomadik/pinctrl-nomadik.c
··· 1051 1051 1052 1052 gpio_pdev = of_find_device_by_node(np); 1053 1053 if (!gpio_pdev) { 1054 - pr_err("populate \"%s\": device not found\n", np->name); 1054 + pr_err("populate \"%pOFn\": device not found\n", np); 1055 1055 return ERR_PTR(-ENODEV); 1056 1056 } 1057 1057 if (of_property_read_u32(np, "gpio-bank", &id)) { ··· 1904 1904 gpio_np = of_parse_phandle(np, "nomadik-gpio-chips", i); 1905 1905 if (gpio_np) { 1906 1906 dev_info(&pdev->dev, 1907 - "populate NMK GPIO %d \"%s\"\n", 1908 - i, gpio_np->name); 1907 + "populate NMK GPIO %d \"%pOFn\"\n", 1908 + i, gpio_np); 1909 1909 nmk_chip = nmk_gpio_populate_chip(gpio_np, pdev); 1910 1910 if (IS_ERR(nmk_chip)) 1911 1911 dev_err(&pdev->dev,
+4 -4
drivers/pinctrl/pinctrl-at91.c
··· 263 263 */ 264 264 grp = at91_pinctrl_find_group_by_name(info, np->name); 265 265 if (!grp) { 266 - dev_err(info->dev, "unable to find group for node %s\n", 267 - np->name); 266 + dev_err(info->dev, "unable to find group for node %pOFn\n", 267 + np); 268 268 return -EINVAL; 269 269 } 270 270 ··· 1071 1071 const __be32 *list; 1072 1072 int i, j; 1073 1073 1074 - dev_dbg(info->dev, "group(%d): %s\n", index, np->name); 1074 + dev_dbg(info->dev, "group(%d): %pOFn\n", index, np); 1075 1075 1076 1076 /* Initialise group */ 1077 1077 grp->name = np->name; ··· 1122 1122 static u32 grp_index; 1123 1123 u32 i = 0; 1124 1124 1125 - dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name); 1125 + dev_dbg(info->dev, "parse function(%d): %pOFn\n", index, np); 1126 1126 1127 1127 func = &info->functions[index]; 1128 1128
+4 -4
drivers/pinctrl/pinctrl-lantiq.c
··· 80 80 int ret, i; 81 81 82 82 if (!pins && !groups) { 83 - dev_err(pctldev->dev, "%s defines neither pins nor groups\n", 84 - np->name); 83 + dev_err(pctldev->dev, "%pOFn defines neither pins nor groups\n", 84 + np); 85 85 return; 86 86 } 87 87 88 88 if (pins && groups) { 89 - dev_err(pctldev->dev, "%s defines both pins and groups\n", 90 - np->name); 89 + dev_err(pctldev->dev, "%pOFn defines both pins and groups\n", 90 + np); 91 91 return; 92 92 } 93 93
+4 -4
drivers/pinctrl/pinctrl-rockchip.c
··· 501 501 */ 502 502 grp = pinctrl_name_to_group(info, np->name); 503 503 if (!grp) { 504 - dev_err(info->dev, "unable to find group for node %s\n", 505 - np->name); 504 + dev_err(info->dev, "unable to find group for node %pOFn\n", 505 + np); 506 506 return -EINVAL; 507 507 } 508 508 ··· 2454 2454 int i, j; 2455 2455 int ret; 2456 2456 2457 - dev_dbg(info->dev, "group(%d): %s\n", index, np->name); 2457 + dev_dbg(info->dev, "group(%d): %pOFn\n", index, np); 2458 2458 2459 2459 /* Initialise group */ 2460 2460 grp->name = np->name; ··· 2519 2519 static u32 grp_index; 2520 2520 u32 i = 0; 2521 2521 2522 - dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name); 2522 + dev_dbg(info->dev, "parse function(%d): %pOFn\n", index, np); 2523 2523 2524 2524 func = &info->functions[index]; 2525 2525
+4 -4
drivers/pinctrl/pinctrl-rza1.c
··· 930 930 &npin_configs); 931 931 if (ret) { 932 932 dev_err(rza1_pctl->dev, 933 - "Unable to parse pin configuration options for %s\n", 934 - np->name); 933 + "Unable to parse pin configuration options for %pOFn\n", 934 + np); 935 935 return ret; 936 936 } 937 937 ··· 1226 1226 1227 1227 *chip = rza1_gpiochip_template; 1228 1228 chip->base = -1; 1229 - chip->label = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%s", 1230 - np->name); 1229 + chip->label = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn", 1230 + np); 1231 1231 chip->ngpio = of_args.args[2]; 1232 1232 chip->of_node = np; 1233 1233 chip->parent = rza1_pctl->dev;
+16 -16
drivers/pinctrl/pinctrl-single.c
··· 1022 1022 vals[found].reg = pcs->base + offset; 1023 1023 vals[found].val = pinctrl_spec.args[1]; 1024 1024 1025 - dev_dbg(pcs->dev, "%s index: 0x%x value: 0x%x\n", 1026 - pinctrl_spec.np->name, offset, pinctrl_spec.args[1]); 1025 + dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n", 1026 + pinctrl_spec.np, offset, pinctrl_spec.args[1]); 1027 1027 1028 1028 pin = pcs_get_pin_by_offset(pcs, offset); 1029 1029 if (pin < 0) { 1030 1030 dev_err(pcs->dev, 1031 - "could not add functions for %s %ux\n", 1032 - np->name, offset); 1031 + "could not add functions for %pOFn %ux\n", 1032 + np, offset); 1033 1033 break; 1034 1034 } 1035 1035 pins[found++] = pin; ··· 1135 1135 val = pinctrl_spec.args[1]; 1136 1136 mask = pinctrl_spec.args[2]; 1137 1137 1138 - dev_dbg(pcs->dev, "%s index: 0x%x value: 0x%x mask: 0x%x\n", 1139 - pinctrl_spec.np->name, offset, val, mask); 1138 + dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x mask: 0x%x\n", 1139 + pinctrl_spec.np, offset, val, mask); 1140 1140 1141 1141 /* Parse pins in each row from LSB */ 1142 1142 while (mask) { ··· 1148 1148 1149 1149 if ((mask & mask_pos) == 0) { 1150 1150 dev_err(pcs->dev, 1151 - "Invalid mask for %s at 0x%x\n", 1152 - np->name, offset); 1151 + "Invalid mask for %pOFn at 0x%x\n", 1152 + np, offset); 1153 1153 break; 1154 1154 } 1155 1155 ··· 1157 1157 1158 1158 if (submask != mask_pos) { 1159 1159 dev_warn(pcs->dev, 1160 - "Invalid submask 0x%x for %s at 0x%x\n", 1161 - submask, np->name, offset); 1160 + "Invalid submask 0x%x for %pOFn at 0x%x\n", 1161 + submask, np, offset); 1162 1162 continue; 1163 1163 } 1164 1164 ··· 1169 1169 pin = pcs_get_pin_by_offset(pcs, offset); 1170 1170 if (pin < 0) { 1171 1171 dev_err(pcs->dev, 1172 - "could not add functions for %s %ux\n", 1173 - np->name, offset); 1172 + "could not add functions for %pOFn %ux\n", 1173 + np, offset); 1174 1174 break; 1175 1175 } 1176 1176 pins[found++] = pin + pin_num_from_lsb; ··· 1254 1254 ret = pcs_parse_bits_in_pinctrl_entry(pcs, np_config, map, 1255 1255 num_maps, pgnames); 1256 1256 if (ret < 0) { 1257 - dev_err(pcs->dev, "no pins entries for %s\n", 1258 - np_config->name); 1257 + dev_err(pcs->dev, "no pins entries for %pOFn\n", 1258 + np_config); 1259 1259 goto free_pgnames; 1260 1260 } 1261 1261 } else { 1262 1262 ret = pcs_parse_one_pinctrl_entry(pcs, np_config, map, 1263 1263 num_maps, pgnames); 1264 1264 if (ret < 0) { 1265 - dev_err(pcs->dev, "no pins entries for %s\n", 1266 - np_config->name); 1265 + dev_err(pcs->dev, "no pins entries for %pOFn\n", 1266 + np_config); 1267 1267 goto free_pgnames; 1268 1268 } 1269 1269 }
+3 -3
drivers/pinctrl/pinctrl-st.c
··· 817 817 818 818 grp = st_pctl_find_group_by_name(info, np->name); 819 819 if (!grp) { 820 - dev_err(info->dev, "unable to find group for node %s\n", 821 - np->name); 820 + dev_err(info->dev, "unable to find group for node %pOFn\n", 821 + np); 822 822 return -EINVAL; 823 823 } 824 824 ··· 1184 1184 if (pp->length / sizeof(__be32) >= OF_GPIO_ARGS_MIN) { 1185 1185 npins++; 1186 1186 } else { 1187 - pr_warn("Invalid st,pins in %s node\n", np->name); 1187 + pr_warn("Invalid st,pins in %pOFn node\n", np); 1188 1188 return -EINVAL; 1189 1189 } 1190 1190 }
+2 -2
drivers/pinctrl/sirf/pinctrl-atlas7.c
··· 6058 6058 ret = gpiochip_add_data(chip, a7gc); 6059 6059 if (ret) { 6060 6060 dev_err(&pdev->dev, 6061 - "%s: error in probe function with status %d\n", 6062 - np->name, ret); 6061 + "%pOF: error in probe function with status %d\n", 6062 + np, ret); 6063 6063 goto failed; 6064 6064 } 6065 6065
+2 -2
drivers/pinctrl/stm32/pinctrl-stm32.c
··· 416 416 417 417 pins = of_find_property(node, "pinmux", NULL); 418 418 if (!pins) { 419 - dev_err(pctl->dev, "missing pins property in node %s .\n", 420 - node->name); 419 + dev_err(pctl->dev, "missing pins property in node %pOFn .\n", 420 + node); 421 421 return -EINVAL; 422 422 } 423 423
+4 -4
drivers/pinctrl/sunxi/pinctrl-sunxi.c
··· 332 332 333 333 function = sunxi_pctrl_parse_function_prop(node); 334 334 if (!function) { 335 - dev_err(pctl->dev, "missing function property in node %s\n", 336 - node->name); 335 + dev_err(pctl->dev, "missing function property in node %pOFn\n", 336 + node); 337 337 return -EINVAL; 338 338 } 339 339 340 340 pin_prop = sunxi_pctrl_find_pins_prop(node, &npins); 341 341 if (!pin_prop) { 342 - dev_err(pctl->dev, "missing pins property in node %s\n", 343 - node->name); 342 + dev_err(pctl->dev, "missing pins property in node %pOFn\n", 343 + node); 344 344 return -EINVAL; 345 345 } 346 346
+4 -4
drivers/pinctrl/ti/pinctrl-ti-iodelay.c
··· 452 452 453 453 pin = ti_iodelay_offset_to_pin(iod, cfg[pin_index].offset); 454 454 if (pin < 0) { 455 - dev_err(iod->dev, "could not add functions for %s %ux\n", 456 - np->name, cfg[pin_index].offset); 455 + dev_err(iod->dev, "could not add functions for %pOFn %ux\n", 456 + np, cfg[pin_index].offset); 457 457 return -ENODEV; 458 458 } 459 459 pins[pin_index] = pin; ··· 461 461 pd = &iod->pa[pin]; 462 462 pd->drv_data = &cfg[pin_index]; 463 463 464 - dev_dbg(iod->dev, "%s offset=%x a_delay = %d g_delay = %d\n", 465 - np->name, cfg[pin_index].offset, cfg[pin_index].a_delay, 464 + dev_dbg(iod->dev, "%pOFn offset=%x a_delay = %d g_delay = %d\n", 465 + np, cfg[pin_index].offset, cfg[pin_index].a_delay, 466 466 cfg[pin_index].g_delay); 467 467 468 468 return 0;