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

gpio: 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: Tien Hock Loh <thloh@altera.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Rob Herring and committed by
Linus Walleij
7eb6ce2f 1a9ef909

+31 -35
+2 -2
drivers/gpio/gpio-altera.c
··· 324 324 return 0; 325 325 teardown: 326 326 of_mm_gpiochip_remove(&altera_gc->mmchip); 327 - pr_err("%s: registration failed with status %d\n", 328 - node->full_name, ret); 327 + pr_err("%pOF: registration failed with status %d\n", 328 + node, ret); 329 329 330 330 return ret; 331 331 }
+1 -1
drivers/gpio/gpio-brcmstb.c
··· 483 483 484 484 gc->of_node = np; 485 485 gc->owner = THIS_MODULE; 486 - gc->label = np->full_name; 486 + gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node); 487 487 gc->base = gpio_base; 488 488 gc->of_gpio_n_cells = 2; 489 489 gc->of_xlate = brcmstb_gpio_of_xlate;
+2 -4
drivers/gpio/gpio-ge.c
··· 76 76 } 77 77 78 78 /* Setup pointers to chip functions */ 79 - gc->label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name, 80 - GFP_KERNEL); 79 + gc->label = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); 81 80 if (!gc->label) { 82 81 ret = -ENOMEM; 83 82 goto err0; ··· 95 96 return 0; 96 97 err0: 97 98 iounmap(regs); 98 - pr_err("%s: GPIO chip registration failed\n", 99 - pdev->dev.of_node->full_name); 99 + pr_err("%pOF: GPIO chip registration failed\n", pdev->dev.of_node); 100 100 return ret; 101 101 }; 102 102
+1 -1
drivers/gpio/gpio-grgpio.c
··· 367 367 gc->of_node = np; 368 368 gc->owner = THIS_MODULE; 369 369 gc->to_irq = grgpio_to_irq; 370 - gc->label = np->full_name; 370 + gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np); 371 371 gc->base = -1; 372 372 373 373 err = of_property_read_u32(np, "nbits", &prop);
+2 -2
drivers/gpio/gpio-mpc8xxx.c
··· 348 348 349 349 ret = gpiochip_add_data(gc, mpc8xxx_gc); 350 350 if (ret) { 351 - pr_err("%s: GPIO chip registration failed with status %d\n", 352 - np->full_name, ret); 351 + pr_err("%pOF: GPIO chip registration failed with status %d\n", 352 + np, ret); 353 353 goto err; 354 354 } 355 355
+2 -1
drivers/gpio/gpio-tb10x.c
··· 191 191 if (IS_ERR(tb10x_gpio->base)) 192 192 return PTR_ERR(tb10x_gpio->base); 193 193 194 - tb10x_gpio->gc.label = of_node_full_name(dn); 194 + tb10x_gpio->gc.label = 195 + devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); 195 196 tb10x_gpio->gc.parent = &pdev->dev; 196 197 tb10x_gpio->gc.owner = THIS_MODULE; 197 198 tb10x_gpio->gc.direction_input = tb10x_gpio_direction_in;
+4 -6
drivers/gpio/gpio-tz1090.c
··· 527 527 528 528 ret = of_property_read_u32(node, "reg", &addr); 529 529 if (ret) { 530 - dev_err(priv->dev, "invalid reg on %s\n", 531 - node->full_name); 530 + dev_err(priv->dev, "invalid reg on %pOF\n", node); 532 531 continue; 533 532 } 534 533 if (addr >= 3) { 535 - dev_err(priv->dev, "index %u in %s out of range\n", 536 - addr, node->full_name); 534 + dev_err(priv->dev, "index %u in %pOF out of range\n", 535 + addr, node); 537 536 continue; 538 537 } 539 538 ··· 542 543 543 544 ret = tz1090_gpio_bank_probe(&info); 544 545 if (ret) { 545 - dev_err(priv->dev, "failure registering %s\n", 546 - node->full_name); 546 + dev_err(priv->dev, "failure registering %pOF\n", node); 547 547 of_node_put(node); 548 548 continue; 549 549 }
+2 -2
drivers/gpio/gpio-xilinx.c
··· 360 360 /* Call the OF gpio helper to setup and register the GPIO device */ 361 361 status = of_mm_gpiochip_add_data(np, &chip->mmchip, chip); 362 362 if (status) { 363 - pr_err("%s: error in probe function with status %d\n", 364 - np->full_name, status); 363 + pr_err("%pOF: error in probe function with status %d\n", 364 + np, status); 365 365 return status; 366 366 } 367 367
+14 -15
drivers/gpio/gpiolib-of.c
··· 78 78 ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", index, 79 79 &gpiospec); 80 80 if (ret) { 81 - pr_debug("%s: can't parse '%s' property of node '%s[%d]'\n", 82 - __func__, propname, np->full_name, index); 81 + pr_debug("%s: can't parse '%s' property of node '%pOF[%d]'\n", 82 + __func__, propname, np, index); 83 83 return ERR_PTR(ret); 84 84 } 85 85 ··· 93 93 if (IS_ERR(desc)) 94 94 goto out; 95 95 96 - pr_debug("%s: parsed '%s' property of node '%s[%d]' - status (%d)\n", 97 - __func__, propname, np->full_name, index, 96 + pr_debug("%s: parsed '%s' property of node '%pOF[%d]' - status (%d)\n", 97 + __func__, propname, np, index, 98 98 PTR_ERR_OR_ZERO(desc)); 99 99 100 100 out: ··· 337 337 int ret = -ENOMEM; 338 338 struct gpio_chip *gc = &mm_gc->gc; 339 339 340 - gc->label = kstrdup(np->full_name, GFP_KERNEL); 340 + gc->label = kasprintf(GFP_KERNEL, "%pOF", np); 341 341 if (!gc->label) 342 342 goto err0; 343 343 ··· 362 362 err1: 363 363 kfree(gc->label); 364 364 err0: 365 - pr_err("%s: GPIO chip registration failed with status %d\n", 366 - np->full_name, ret); 365 + pr_err("%pOF: GPIO chip registration failed with status %d\n", np, ret); 367 366 return ret; 368 367 } 369 368 EXPORT_SYMBOL(of_mm_gpiochip_add_data); ··· 417 418 group_names_propname, 418 419 index, &name); 419 420 if (strlen(name)) { 420 - pr_err("%s: Group name of numeric GPIO ranges must be the empty string.\n", 421 - np->full_name); 421 + pr_err("%pOF: Group name of numeric GPIO ranges must be the empty string.\n", 422 + np); 422 423 break; 423 424 } 424 425 } ··· 433 434 } else { 434 435 /* npins == 0: special range */ 435 436 if (pinspec.args[1]) { 436 - pr_err("%s: Illegal gpio-range format.\n", 437 - np->full_name); 437 + pr_err("%pOF: Illegal gpio-range format.\n", 438 + np); 438 439 break; 439 440 } 440 441 441 442 if (!group_names) { 442 - pr_err("%s: GPIO group range requested but no %s property.\n", 443 - np->full_name, group_names_propname); 443 + pr_err("%pOF: GPIO group range requested but no %s property.\n", 444 + np, group_names_propname); 444 445 break; 445 446 } 446 447 ··· 451 452 break; 452 453 453 454 if (!strlen(name)) { 454 - pr_err("%s: Group name of GPIO group range cannot be the empty string.\n", 455 - np->full_name); 455 + pr_err("%pOF: Group name of GPIO group range cannot be the empty string.\n", 456 + np); 456 457 break; 457 458 } 458 459
+1 -1
drivers/gpio/gpiolib.c
··· 1787 1787 * conflicting triggers. Tell the user, and reset to NONE. 1788 1788 */ 1789 1789 if (WARN(of_node && type != IRQ_TYPE_NONE, 1790 - "%s: Ignoring %d default trigger\n", of_node->full_name, type)) 1790 + "%pOF: Ignoring %d default trigger\n", of_node, type)) 1791 1791 type = IRQ_TYPE_NONE; 1792 1792 if (has_acpi_companion(gpiochip->parent) && type != IRQ_TYPE_NONE) { 1793 1793 acpi_handle_warn(ACPI_HANDLE(gpiochip->parent),