Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 790603,
    "url": "http://patchwork.ozlabs.org/api/patches/790603/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170718214339.7774-6-robh@kernel.org/",
    "project": {
        "id": 2,
        "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api",
        "name": "Linux PPC development",
        "link_name": "linuxppc-dev",
        "list_id": "linuxppc-dev.lists.ozlabs.org",
        "list_email": "linuxppc-dev@lists.ozlabs.org",
        "web_url": "https://github.com/linuxppc/wiki/wiki",
        "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git",
        "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/",
        "list_archive_url": "https://lore.kernel.org/linuxppc-dev/",
        "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/",
        "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"
    },
    "msgid": "<20170718214339.7774-6-robh@kernel.org>",
    "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20170718214339.7774-6-robh@kernel.org/",
    "date": "2017-07-18T21:42:46",
    "name": "powerpc: Convert to using %pOF instead of full_name",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "227b6b9a0745220e85e854dba217805d5dd900e2",
    "submitter": {
        "id": 62529,
        "url": "http://patchwork.ozlabs.org/api/people/62529/?format=api",
        "name": "Rob Herring",
        "email": "robh@kernel.org"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170718214339.7774-6-robh@kernel.org/mbox/",
    "series": [],
    "comments": "http://patchwork.ozlabs.org/api/patches/790603/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/790603/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>",
        "X-Original-To": [
            "patchwork-incoming@ozlabs.org",
            "linuxppc-dev@lists.ozlabs.org"
        ],
        "Delivered-To": [
            "patchwork-incoming@ozlabs.org",
            "linuxppc-dev@lists.ozlabs.org"
        ],
        "Received": [
            "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xBv2n60CXz9sRg\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 19 Jul 2017 07:49:53 +1000 (AEST)",
            "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xBv2n0YbzzDrMb\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 19 Jul 2017 07:49:53 +1000 (AEST)",
            "from mail-pf0-f193.google.com (mail-pf0-f193.google.com\n\t[209.85.192.193])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xBtvw2S6RzDrK9\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tWed, 19 Jul 2017 07:43:56 +1000 (AEST)",
            "by mail-pf0-f193.google.com with SMTP id o88so4063402pfk.1\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tTue, 18 Jul 2017 14:43:56 -0700 (PDT)",
            "from localhost.localdomain (24-223-123-72.static.usa-companies.net.\n\t[24.223.123.72]) by smtp.googlemail.com with ESMTPSA id\n\tr207sm7186560pfr.106.2017.07.18.14.43.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 18 Jul 2017 14:43:52 -0700 (PDT)"
        ],
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=qJud8zJY0C4XXHNUkr0pwasDok9PJDcPoZLzrx0fYoM=;\n\tb=V/YqQQr2Cozx3R2T2k1T5jWcqit4iMQ4rbo/DoOJjDMh/yTNL2iirJeQidOOzE0eO4\n\tqAnnlWhANvozMpFX/jW0zZcp687gZ7lQGyYhNbdPFXtxQk9LhJhPW8FEReJ3k37AbHhj\n\thQceok0juJXU8xBAnYuNuggWs+zFJZhZFyftvvA4+Nt414M4PUZ+ONEaUdvrQGbdCHk6\n\tHRAXmKDdP9j/0H+X2Y6Slzet/RfxonChf5hH6aqDJa32D0whrxgTLr/6Q8aiKP0Cq2+T\n\twvKKKLv14sKwJK20ZY+yJRXhxMAzMVCUO14ykn5Q+raIsSgpXqrfeOCxJDKsT+CVEfyy\n\tIM8Q==",
        "X-Gm-Message-State": "AIVw113UH6lxdLxl/pStX74omcEPgAGEsxMvCWX6PH2So/hXitDjBOwe\n\tZFjhSpaU1bcgxg==",
        "X-Received": "by 10.99.36.198 with SMTP id k189mr3815583pgk.230.1500414233562; \n\tTue, 18 Jul 2017 14:43:53 -0700 (PDT)",
        "From": "Rob Herring <robh@kernel.org>",
        "To": "Michael Ellerman <mpe@ellerman.id.au>",
        "Subject": "[PATCH] powerpc: Convert to using %pOF instead of full_name",
        "Date": "Tue, 18 Jul 2017 16:42:46 -0500",
        "Message-Id": "<20170718214339.7774-6-robh@kernel.org>",
        "X-Mailer": "git-send-email 2.11.0",
        "X-BeenThere": "linuxppc-dev@lists.ozlabs.org",
        "X-Mailman-Version": "2.1.23",
        "Precedence": "list",
        "List-Id": "Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>",
        "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>",
        "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>",
        "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>",
        "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>",
        "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>",
        "Cc": "devicetree@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,\n\tlinux-kernel@vger.kernel.org, Scott Wood <oss@buserror.net>,\n\tPaul Mackerras <paulus@samba.org>, Anatolij Gustschin <agust@denx.de>,\n\tlinuxppc-dev@lists.ozlabs.org",
        "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org",
        "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"
    },
    "content": "Now that we have a custom printf format specifier, convert users of\nfull_name to use %pOF instead. This is preparation to remove storing\nof the full path string for each node.\n\nSigned-off-by: Rob Herring <robh@kernel.org>\nCc: Benjamin Herrenschmidt <benh@kernel.crashing.org>\nCc: Paul Mackerras <paulus@samba.org>\nCc: Michael Ellerman <mpe@ellerman.id.au>\nCc: Anatolij Gustschin <agust@denx.de>\nCc: Scott Wood <oss@buserror.net>\nCc: Kumar Gala <galak@kernel.crashing.org>\nCc: Arnd Bergmann <arnd@arndb.de>\nCc: linuxppc-dev@lists.ozlabs.org\n---\n arch/powerpc/kernel/btext.c                      |   2 +-\n arch/powerpc/kernel/cacheinfo.c                  |  34 ++++---\n arch/powerpc/kernel/io-workarounds.c             |   4 +-\n arch/powerpc/kernel/isa-bridge.c                 |  32 +++----\n arch/powerpc/kernel/legacy_serial.c              |  12 +--\n arch/powerpc/kernel/of_platform.c                |   2 +-\n arch/powerpc/kernel/pci-common.c                 |  15 ++-\n arch/powerpc/kernel/pci_32.c                     |   4 +-\n arch/powerpc/kernel/pci_64.c                     |   4 +-\n arch/powerpc/kernel/pci_of_scan.c                |  24 ++---\n arch/powerpc/kernel/setup-common.c               |   2 +-\n arch/powerpc/platforms/512x/mpc512x_shared.c     |  12 +--\n arch/powerpc/platforms/52xx/efika.c              |   8 +-\n arch/powerpc/platforms/52xx/media5200.c          |   2 +-\n arch/powerpc/platforms/52xx/mpc52xx_gpt.c        |   4 +-\n arch/powerpc/platforms/52xx/mpc52xx_pci.c        |   8 +-\n arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c   |   3 +-\n arch/powerpc/platforms/83xx/mpc832x_rdb.c        |   2 +-\n arch/powerpc/platforms/85xx/p1022_ds.c           |   8 +-\n arch/powerpc/platforms/85xx/xes_mpc85xx.c        |   4 +-\n arch/powerpc/platforms/amigaone/setup.c          |   6 +-\n arch/powerpc/platforms/cell/axon_msi.c           |  36 +++----\n arch/powerpc/platforms/cell/interrupt.c          |   4 +-\n arch/powerpc/platforms/cell/iommu.c              |  24 ++---\n arch/powerpc/platforms/cell/ras.c                |   4 +-\n arch/powerpc/platforms/cell/spider-pci.c         |   4 +-\n arch/powerpc/platforms/cell/spider-pic.c         |   4 +-\n arch/powerpc/platforms/cell/spu_manage.c         |  26 ++---\n arch/powerpc/platforms/chrp/pci.c                |  18 ++--\n arch/powerpc/platforms/embedded6xx/linkstation.c |   6 +-\n arch/powerpc/platforms/embedded6xx/mvme5100.c    |   2 +-\n arch/powerpc/platforms/embedded6xx/storcenter.c  |   2 +-\n arch/powerpc/platforms/maple/pci.c               |  10 +-\n arch/powerpc/platforms/pasemi/pci.c              |   2 +-\n arch/powerpc/platforms/powermac/feature.c        |  14 +--\n arch/powerpc/platforms/powermac/low_i2c.c        |  50 +++++-----\n arch/powerpc/platforms/powermac/pci.c            |   6 +-\n arch/powerpc/platforms/powermac/pfunc_base.c     |  24 ++---\n arch/powerpc/platforms/powermac/pfunc_core.c     |   6 +-\n arch/powerpc/platforms/powermac/pic.c            |   8 +-\n arch/powerpc/platforms/powermac/setup.c          |   2 +-\n arch/powerpc/platforms/powernv/opal-async.c      |   4 +-\n arch/powerpc/platforms/powernv/opal-xscom.c      |   8 +-\n arch/powerpc/platforms/powernv/pci-ioda.c        |  15 ++-\n arch/powerpc/platforms/powernv/rng.c             |   6 +-\n arch/powerpc/platforms/pseries/dlpar.c           |   3 +-\n arch/powerpc/platforms/pseries/event_sources.c   |   6 +-\n arch/powerpc/platforms/pseries/hotplug-cpu.c     |   4 +-\n arch/powerpc/platforms/pseries/ibmebus.c         |   5 +-\n arch/powerpc/platforms/pseries/iommu.c           |  58 ++++++------\n arch/powerpc/platforms/pseries/msi.c             |  12 +--\n arch/powerpc/platforms/pseries/pci_dlpar.c       |   2 +-\n arch/powerpc/platforms/pseries/vio.c             |  12 +--\n arch/powerpc/sysdev/axonram.c                    |   4 +-\n arch/powerpc/sysdev/dcr.c                        |   4 +-\n arch/powerpc/sysdev/fsl_85xx_cache_sram.c        |  12 +--\n arch/powerpc/sysdev/fsl_gtm.c                    |  14 +--\n arch/powerpc/sysdev/fsl_msi.c                    |  16 ++--\n arch/powerpc/sysdev/fsl_pci.c                    |  47 +++++----\n arch/powerpc/sysdev/fsl_rio.c                    |  36 +++----\n arch/powerpc/sysdev/fsl_rmu.c                    |  12 +--\n arch/powerpc/sysdev/mpic.c                       |   4 +-\n arch/powerpc/sysdev/mpic_msgr.c                  |   2 +-\n arch/powerpc/sysdev/mpic_msi.c                   |   2 +-\n arch/powerpc/sysdev/mpic_timer.c                 |  19 ++--\n arch/powerpc/sysdev/msi_bitmap.c                 |   4 +-\n arch/powerpc/sysdev/mv64x60_dev.c                |  20 ++--\n arch/powerpc/sysdev/mv64x60_pci.c                |   4 +-\n arch/powerpc/sysdev/of_rtc.c                     |  12 +--\n arch/powerpc/sysdev/ppc4xx_cpm.c                 |   8 +-\n arch/powerpc/sysdev/ppc4xx_gpio.c                |   3 +-\n arch/powerpc/sysdev/ppc4xx_msi.c                 |   3 +-\n arch/powerpc/sysdev/ppc4xx_pci.c                 | 116 ++++++++++-------------\n arch/powerpc/sysdev/ppc4xx_soc.c                 |   5 +-\n arch/powerpc/sysdev/scom.c                       |   5 +-\n arch/powerpc/sysdev/simple_gpio.c                |   3 +-\n arch/powerpc/sysdev/tsi108_pci.c                 |   4 +-\n arch/powerpc/sysdev/uic.c                        |  14 +--\n arch/powerpc/sysdev/xive/native.c                |   2 +-\n 79 files changed, 464 insertions(+), 490 deletions(-)\n\n--\n2.11.0",
    "diff": "diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c\nindex 8275858a434d..3f46ca1c59f9 100644\n--- a/arch/powerpc/kernel/btext.c\n+++ b/arch/powerpc/kernel/btext.c\n@@ -253,7 +253,7 @@ int __init btext_find_display(int allow_nonstdout)\n\n \tfor_each_node_by_type(np, \"display\") {\n \t\tif (of_get_property(np, \"linux,opened\", NULL)) {\n-\t\t\tprintk(\"trying %s ...\\n\", np->full_name);\n+\t\t\tprintk(\"trying %pOF ...\\n\", np);\n \t\t\trc = btext_initialize(np);\n \t\t\tprintk(\"result: %d\\n\", rc);\n \t\t}\ndiff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c\nindex c641983bbdd6..a8f20e5928e1 100644\n--- a/arch/powerpc/kernel/cacheinfo.c\n+++ b/arch/powerpc/kernel/cacheinfo.c\n@@ -167,10 +167,10 @@ static void release_cache_debugcheck(struct cache *cache)\n\n \tlist_for_each_entry(iter, &cache_list, list)\n \t\tWARN_ONCE(iter->next_local == cache,\n-\t\t\t  \"cache for %s(%s) refers to cache for %s(%s)\\n\",\n-\t\t\t  iter->ofnode->full_name,\n+\t\t\t  \"cache for %pOF(%s) refers to cache for %pOF(%s)\\n\",\n+\t\t\t  iter->ofnode,\n \t\t\t  cache_type_string(iter),\n-\t\t\t  cache->ofnode->full_name,\n+\t\t\t  cache->ofnode,\n \t\t\t  cache_type_string(cache));\n }\n\n@@ -179,8 +179,8 @@ static void release_cache(struct cache *cache)\n \tif (!cache)\n \t\treturn;\n\n-\tpr_debug(\"freeing L%d %s cache for %s\\n\", cache->level,\n-\t\t cache_type_string(cache), cache->ofnode->full_name);\n+\tpr_debug(\"freeing L%d %s cache for %pOF\\n\", cache->level,\n+\t\t cache_type_string(cache), cache->ofnode);\n\n \trelease_cache_debugcheck(cache);\n \tlist_del(&cache->list);\n@@ -194,8 +194,8 @@ static void cache_cpu_set(struct cache *cache, int cpu)\n\n \twhile (next) {\n \t\tWARN_ONCE(cpumask_test_cpu(cpu, &next->shared_cpu_map),\n-\t\t\t  \"CPU %i already accounted in %s(%s)\\n\",\n-\t\t\t  cpu, next->ofnode->full_name,\n+\t\t\t  \"CPU %i already accounted in %pOF(%s)\\n\",\n+\t\t\t  cpu, next->ofnode,\n \t\t\t  cache_type_string(next));\n \t\tcpumask_set_cpu(cpu, &next->shared_cpu_map);\n \t\tnext = next->next_local;\n@@ -355,7 +355,7 @@ static int cache_is_unified_d(const struct device_node *np)\n  */\n static struct cache *cache_do_one_devnode_unified(struct device_node *node, int level)\n {\n-\tpr_debug(\"creating L%d ucache for %s\\n\", level, node->full_name);\n+\tpr_debug(\"creating L%d ucache for %pOF\\n\", level, node);\n\n \treturn new_cache(cache_is_unified_d(node), level, node);\n }\n@@ -365,8 +365,8 @@ static struct cache *cache_do_one_devnode_split(struct device_node *node,\n {\n \tstruct cache *dcache, *icache;\n\n-\tpr_debug(\"creating L%d dcache and icache for %s\\n\", level,\n-\t\t node->full_name);\n+\tpr_debug(\"creating L%d dcache and icache for %pOF\\n\", level,\n+\t\t node);\n\n \tdcache = new_cache(CACHE_TYPE_DATA, level, node);\n \ticache = new_cache(CACHE_TYPE_INSTRUCTION, level, node);\n@@ -679,7 +679,6 @@ static struct kobj_type cache_index_type = {\n\n static void cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)\n {\n-\tconst char *cache_name;\n \tconst char *cache_type;\n \tstruct cache *cache;\n \tchar *buf;\n@@ -690,7 +689,6 @@ static void cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)\n \t\treturn;\n\n \tcache = dir->cache;\n-\tcache_name = cache->ofnode->full_name;\n \tcache_type = cache_type_string(cache);\n\n \t/* We don't want to create an attribute that can't provide a\n@@ -707,14 +705,14 @@ static void cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)\n \t\trc = attr->show(&dir->kobj, attr, buf);\n \t\tif (rc <= 0) {\n \t\t\tpr_debug(\"not creating %s attribute for \"\n-\t\t\t\t \"%s(%s) (rc = %zd)\\n\",\n-\t\t\t\t attr->attr.name, cache_name,\n+\t\t\t\t \"%pOF(%s) (rc = %zd)\\n\",\n+\t\t\t\t attr->attr.name, cache->ofnode,\n \t\t\t\t cache_type, rc);\n \t\t\tcontinue;\n \t\t}\n \t\tif (sysfs_create_file(&dir->kobj, &attr->attr))\n-\t\t\tpr_debug(\"could not create %s attribute for %s(%s)\\n\",\n-\t\t\t\t attr->attr.name, cache_name, cache_type);\n+\t\t\tpr_debug(\"could not create %s attribute for %pOF(%s)\\n\",\n+\t\t\t\t attr->attr.name, cache->ofnode, cache_type);\n \t}\n\n \tkfree(buf);\n@@ -831,8 +829,8 @@ static void cache_cpu_clear(struct cache *cache, int cpu)\n \t\tstruct cache *next = cache->next_local;\n\n \t\tWARN_ONCE(!cpumask_test_cpu(cpu, &cache->shared_cpu_map),\n-\t\t\t  \"CPU %i not accounted in %s(%s)\\n\",\n-\t\t\t  cpu, cache->ofnode->full_name,\n+\t\t\t  \"CPU %i not accounted in %pOF(%s)\\n\",\n+\t\t\t  cpu, cache->ofnode,\n \t\t\t  cache_type_string(cache));\n\n \t\tcpumask_clear_cpu(cpu, &cache->shared_cpu_map);\ndiff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c\nindex a582e0d42525..9fd7bf1481bf 100644\n--- a/arch/powerpc/kernel/io-workarounds.c\n+++ b/arch/powerpc/kernel/io-workarounds.c\n@@ -192,7 +192,7 @@ void iowa_register_bus(struct pci_controller *phb, struct ppc_pci_io *ops,\n\n \tif (iowa_bus_count >= IOWA_MAX_BUS) {\n \t\tpr_err(\"IOWA:Too many pci bridges, \"\n-\t\t       \"workarounds disabled for %s\\n\", np->full_name);\n+\t\t       \"workarounds disabled for %pOF\\n\", np);\n \t\treturn;\n \t}\n\n@@ -207,6 +207,6 @@ void iowa_register_bus(struct pci_controller *phb, struct ppc_pci_io *ops,\n\n \tiowa_bus_count++;\n\n-\tpr_debug(\"IOWA:[%d]Add bus, %s.\\n\", iowa_bus_count-1, np->full_name);\n+\tpr_debug(\"IOWA:[%d]Add bus, %pOF.\\n\", iowa_bus_count-1, np);\n }\n\ndiff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c\nindex bb6f8993412e..1df6c74aa731 100644\n--- a/arch/powerpc/kernel/isa-bridge.c\n+++ b/arch/powerpc/kernel/isa-bridge.c\n@@ -164,7 +164,7 @@ void __init isa_bridge_find_early(struct pci_controller *hose)\n \t/* Set the global ISA io base to indicate we have an ISA bridge */\n \tisa_io_base = ISA_IO_BASE;\n\n-\tpr_debug(\"ISA bridge (early) is %s\\n\", np->full_name);\n+\tpr_debug(\"ISA bridge (early) is %pOF\\n\", np);\n }\n\n /**\n@@ -187,15 +187,15 @@ void __init isa_bridge_init_non_pci(struct device_node *np)\n \tpna = of_n_addr_cells(np);\n \tif (of_property_read_u32(np, \"#address-cells\", &na) ||\n \t    of_property_read_u32(np, \"#size-cells\", &ns)) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s is missing address format\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF is missing address format\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n\n \t/* Check it's a supported address format */\n \tif (na != 2 || ns != 1) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s has unsupported address format\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF has unsupported address format\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n \trs = na + ns + pna;\n@@ -203,8 +203,8 @@ void __init isa_bridge_init_non_pci(struct device_node *np)\n \t/* Grab the ranges property */\n \tranges = of_get_property(np, \"ranges\", &rlen);\n \tif (ranges == NULL || rlen < rs) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s has absent or invalid ranges\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF has absent or invalid ranges\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n\n@@ -220,8 +220,8 @@ void __init isa_bridge_init_non_pci(struct device_node *np)\n\n \t/* Got something ? */\n \tif (!size || !pbasep) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s has no usable IO range\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF has no usable IO range\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n\n@@ -233,15 +233,15 @@ void __init isa_bridge_init_non_pci(struct device_node *np)\n \t/* Map pbase */\n \tpbase = of_translate_address(np, pbasep);\n \tif (pbase == OF_BAD_ADDR) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s failed to translate IO base\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF failed to translate IO base\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n\n \t/* We need page alignment */\n \tif ((cbase & ~PAGE_MASK) || (pbase & ~PAGE_MASK)) {\n-\t\tpr_warn(\"ISA: Non-PCI bridge %s has non aligned IO range\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_warn(\"ISA: Non-PCI bridge %pOF has non aligned IO range\\n\",\n+\t\t\tnp);\n \t\treturn;\n \t}\n\n@@ -255,7 +255,7 @@ void __init isa_bridge_init_non_pci(struct device_node *np)\n \t__ioremap_at(pbase, (void *)ISA_IO_BASE,\n \t\t     size, pgprot_val(pgprot_noncached(__pgprot(0))));\n\n-\tpr_debug(\"ISA: Non-PCI bridge is %s\\n\", np->full_name);\n+\tpr_debug(\"ISA: Non-PCI bridge is %pOF\\n\", np);\n }\n\n /**\n@@ -277,8 +277,8 @@ static void isa_bridge_find_late(struct pci_dev *pdev,\n \t/* Set the global ISA io base to indicate we have an ISA bridge */\n \tisa_io_base = ISA_IO_BASE;\n\n-\tpr_debug(\"ISA bridge (late) is %s on %s\\n\",\n-\t\t devnode->full_name, pci_name(pdev));\n+\tpr_debug(\"ISA bridge (late) is %pOF on %s\\n\",\n+\t\t devnode, pci_name(pdev));\n }\n\n /**\ndiff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c\nindex 0694d20f85b6..5e5a64a8b4e4 100644\n--- a/arch/powerpc/kernel/legacy_serial.c\n+++ b/arch/powerpc/kernel/legacy_serial.c\n@@ -147,8 +147,8 @@ static int __init add_legacy_port(struct device_node *np, int want_index,\n \t\tlegacy_serial_ports[index].serial_out = tsi_serial_out;\n \t}\n\n-\tprintk(KERN_DEBUG \"Found legacy serial port %d for %s\\n\",\n-\t       index, np->full_name);\n+\tprintk(KERN_DEBUG \"Found legacy serial port %d for %pOF\\n\",\n+\t       index, np);\n \tprintk(KERN_DEBUG \"  %s=%llx, taddr=%llx, irq=%lx, clk=%d, speed=%d\\n\",\n \t       (iotype == UPIO_PORT) ? \"port\" : \"mem\",\n \t       (unsigned long long)base, (unsigned long long)taddr, irq,\n@@ -207,7 +207,7 @@ static int __init add_legacy_isa_port(struct device_node *np,\n \tint index = -1;\n \tu64 taddr;\n\n-\tDBG(\" -> add_legacy_isa_port(%s)\\n\", np->full_name);\n+\tDBG(\" -> add_legacy_isa_port(%pOF)\\n\", np);\n\n \t/* Get the ISA port number */\n \treg = of_get_property(np, \"reg\", NULL);\n@@ -256,7 +256,7 @@ static int __init add_legacy_pci_port(struct device_node *np,\n \tunsigned int flags;\n \tint iotype, index = -1, lindex = 0;\n\n-\tDBG(\" -> add_legacy_pci_port(%s)\\n\", np->full_name);\n+\tDBG(\" -> add_legacy_pci_port(%pOF)\\n\", np);\n\n \t/* We only support ports that have a clock frequency properly\n \t * encoded in the device-tree (that is have an fcode). Anything\n@@ -374,7 +374,7 @@ void __init find_legacy_serial_ports(void)\n \tif (path != NULL) {\n \t\tstdout = of_find_node_by_path(path);\n \t\tif (stdout)\n-\t\t\tDBG(\"stdout is %s\\n\", stdout->full_name);\n+\t\t\tDBG(\"stdout is %pOF\\n\", stdout);\n \t} else {\n \t\tDBG(\" no linux,stdout-path !\\n\");\n \t}\n@@ -603,7 +603,7 @@ static int __init check_legacy_serial_console(void)\n \t\tDBG(\" can't find stdout package %s !\\n\", name);\n \t\treturn -ENODEV;\n \t}\n-\tDBG(\"stdout is %s\\n\", prom_stdout->full_name);\n+\tDBG(\"stdout is %pOF\\n\", prom_stdout);\n\n \tname = of_get_property(prom_stdout, \"name\", NULL);\n \tif (!name) {\ndiff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c\nindex 34aeac54f120..becaec990140 100644\n--- a/arch/powerpc/kernel/of_platform.c\n+++ b/arch/powerpc/kernel/of_platform.c\n@@ -45,7 +45,7 @@ static int of_pci_phb_probe(struct platform_device *dev)\n \tif (ppc_md.pci_setup_phb == NULL)\n \t\treturn -ENODEV;\n\n-\tpr_info(\"Setting up PCI bus %s\\n\", dev->dev.of_node->full_name);\n+\tpr_info(\"Setting up PCI bus %pOF\\n\", dev->dev.of_node);\n\n \t/* Alloc and setup PHB data structure */\n \tphb = pcibios_alloc_controller(dev->dev.of_node);\ndiff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c\nindex 341a7469cab8..02831a396419 100644\n--- a/arch/powerpc/kernel/pci-common.c\n+++ b/arch/powerpc/kernel/pci-common.c\n@@ -373,9 +373,8 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)\n \t\tif (virq)\n \t\t\tirq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);\n \t} else {\n-\t\tpr_debug(\" Got one, spec %d cells (0x%08x 0x%08x...) on %s\\n\",\n-\t\t\t oirq.args_count, oirq.args[0], oirq.args[1],\n-\t\t\t of_node_full_name(oirq.np));\n+\t\tpr_debug(\" Got one, spec %d cells (0x%08x 0x%08x...) on %pOF\\n\",\n+\t\t\t oirq.args_count, oirq.args[0], oirq.args[1], oirq.np);\n\n \t\tvirq = irq_create_of_mapping(&oirq);\n \t}\n@@ -741,8 +740,8 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,\n \tstruct of_pci_range range;\n \tstruct of_pci_range_parser parser;\n\n-\tprintk(KERN_INFO \"PCI host bridge %s %s ranges:\\n\",\n-\t       dev->full_name, primary ? \"(primary)\" : \"\");\n+\tprintk(KERN_INFO \"PCI host bridge %pOF %s ranges:\\n\",\n+\t       dev, primary ? \"(primary)\" : \"\");\n\n \t/* Check for ranges property */\n \tif (of_pci_range_parser_init(&parser, dev))\n@@ -1556,8 +1555,8 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,\n\n \tif (!res->flags) {\n \t\tpr_debug(\"PCI: I/O resource not set for host\"\n-\t\t\t \" bridge %s (domain %d)\\n\",\n-\t\t\t hose->dn->full_name, hose->global_number);\n+\t\t\t \" bridge %pOF (domain %d)\\n\",\n+\t\t\t hose->dn, hose->global_number);\n \t} else {\n \t\toffset = pcibios_io_space_offset(hose);\n\n@@ -1668,7 +1667,7 @@ void pcibios_scan_phb(struct pci_controller *hose)\n \tstruct device_node *node = hose->dn;\n \tint mode;\n\n-\tpr_debug(\"PCI: Scanning PHB %s\\n\", of_node_full_name(node));\n+\tpr_debug(\"PCI: Scanning PHB %pOF\\n\", node);\n\n \t/* Get some IO space for the new PHB */\n \tpcibios_setup_phb_io_space(hose);\ndiff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c\nindex 41c86c6b6e4d..1d817f4d97d9 100644\n--- a/arch/powerpc/kernel/pci_32.c\n+++ b/arch/powerpc/kernel/pci_32.c\n@@ -79,8 +79,8 @@ make_one_node_map(struct device_node* node, u8 pci_bus)\n \t\treturn;\n \tbus_range = of_get_property(node, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, \"\n-\t\t       \"assuming it starts at 0\\n\", node->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, \"\n+\t\t       \"assuming it starts at 0\\n\", node);\n \t\tpci_to_OF_bus_map[pci_bus] = 0;\n \t} else\n \t\tpci_to_OF_bus_map[pci_bus] = bus_range[0];\ndiff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c\nindex ed5e9ff61a68..932b9741aa8f 100644\n--- a/arch/powerpc/kernel/pci_64.c\n+++ b/arch/powerpc/kernel/pci_64.c\n@@ -111,7 +111,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)\n \tif (hose->io_base_alloc == NULL)\n \t\treturn 0;\n\n-\tpr_debug(\"IO unmapping for PHB %s\\n\", hose->dn->full_name);\n+\tpr_debug(\"IO unmapping for PHB %pOF\\n\", hose->dn);\n \tpr_debug(\"  alloc=0x%p\\n\", hose->io_base_alloc);\n\n \t/* This is a PHB, we fully unmap the IO area */\n@@ -151,7 +151,7 @@ static int pcibios_map_phb_io_space(struct pci_controller *hose)\n \those->io_base_virt = (void __iomem *)(area->addr +\n \t\t\t\t\t      hose->io_base_phys - phys_page);\n\n-\tpr_debug(\"IO mapping for PHB %s\\n\", hose->dn->full_name);\n+\tpr_debug(\"IO mapping for PHB %pOF\\n\", hose->dn);\n \tpr_debug(\"  phys=0x%016llx, virt=0x%p (alloc=0x%p)\\n\",\n \t\t hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);\n \tpr_debug(\"  size=0x%016llx (alloc=0x%016lx)\\n\",\ndiff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c\nindex ea3d98115b88..0d790f8432d2 100644\n--- a/arch/powerpc/kernel/pci_of_scan.c\n+++ b/arch/powerpc/kernel/pci_of_scan.c\n@@ -211,19 +211,19 @@ void of_scan_pci_bridge(struct pci_dev *dev)\n \tunsigned int flags;\n \tu64 size;\n\n-\tpr_debug(\"of_scan_pci_bridge(%s)\\n\", node->full_name);\n+\tpr_debug(\"of_scan_pci_bridge(%pOF)\\n\", node);\n\n \t/* parse bus-range property */\n \tbusrange = of_get_property(node, \"bus-range\", &len);\n \tif (busrange == NULL || len != 8) {\n-\t\tprintk(KERN_DEBUG \"Can't get bus-range for PCI-PCI bridge %s\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_DEBUG \"Can't get bus-range for PCI-PCI bridge %pOF\\n\",\n+\t\t       node);\n \t\treturn;\n \t}\n \tranges = of_get_property(node, \"ranges\", &len);\n \tif (ranges == NULL) {\n-\t\tprintk(KERN_DEBUG \"Can't get ranges for PCI-PCI bridge %s\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_DEBUG \"Can't get ranges for PCI-PCI bridge %pOF\\n\",\n+\t\t       node);\n \t\treturn;\n \t}\n\n@@ -233,8 +233,8 @@ void of_scan_pci_bridge(struct pci_dev *dev)\n \t\tbus = pci_add_new_bus(dev->bus, dev,\n \t\t\t\t      of_read_number(busrange, 1));\n \t\tif (!bus) {\n-\t\t\tprintk(KERN_ERR \"Failed to create pci bus for %s\\n\",\n-\t\t\t       node->full_name);\n+\t\t\tprintk(KERN_ERR \"Failed to create pci bus for %pOF\\n\",\n+\t\t\t       node);\n \t\t\treturn;\n \t\t}\n \t}\n@@ -262,13 +262,13 @@ void of_scan_pci_bridge(struct pci_dev *dev)\n \t\t\tres = bus->resource[0];\n \t\t\tif (res->flags) {\n \t\t\t\tprintk(KERN_ERR \"PCI: ignoring extra I/O range\"\n-\t\t\t\t       \" for bridge %s\\n\", node->full_name);\n+\t\t\t\t       \" for bridge %pOF\\n\", node);\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t} else {\n \t\t\tif (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {\n \t\t\t\tprintk(KERN_ERR \"PCI: too many memory ranges\"\n-\t\t\t\t       \" for bridge %s\\n\", node->full_name);\n+\t\t\t\t       \" for bridge %pOF\\n\", node);\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tres = bus->resource[i];\n@@ -307,7 +307,7 @@ static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,\n \tstruct eeh_dev *edev = pdn_to_eeh_dev(PCI_DN(dn));\n #endif\n\n-\tpr_debug(\"  * %s\\n\", dn->full_name);\n+\tpr_debug(\"  * %pOF\\n\", dn);\n \tif (!of_device_is_available(dn))\n \t\treturn NULL;\n\n@@ -350,8 +350,8 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,\n \tstruct device_node *child;\n \tstruct pci_dev *dev;\n\n-\tpr_debug(\"of_scan_bus(%s) bus no %d...\\n\",\n-\t\t node->full_name, bus->number);\n+\tpr_debug(\"of_scan_bus(%pOF) bus no %d...\\n\",\n+\t\t node, bus->number);\n\n \t/* Scan direct children */\n \tfor_each_child_of_node(node, child) {\ndiff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c\nindex 94a948207cd2..417871054006 100644\n--- a/arch/powerpc/kernel/setup-common.c\n+++ b/arch/powerpc/kernel/setup-common.c\n@@ -481,7 +481,7 @@ void __init smp_setup_cpu_maps(void)\n \t\t__be32 cpu_be;\n \t\tint j, len;\n\n-\t\tDBG(\"  * %s...\\n\", dn->full_name);\n+\t\tDBG(\"  * %pOF...\\n\", dn);\n\n \t\tintserv = of_get_property(dn, \"ibm,ppc-interrupt-server#s\",\n \t\t\t\t&len);\ndiff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c\nindex 6b4f4cb7009a..f99e79ee060e 100644\n--- a/arch/powerpc/platforms/512x/mpc512x_shared.c\n+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c\n@@ -387,8 +387,8 @@ static unsigned int __init get_fifo_size(struct device_node *np,\n \tif (fp)\n \t\treturn *fp;\n\n-\tpr_warning(\"no %s property in %s node, defaulting to %d\\n\",\n-\t\t   prop_name, np->full_name, DEFAULT_FIFO_SIZE);\n+\tpr_warning(\"no %s property in %pOF node, defaulting to %d\\n\",\n+\t\t   prop_name, np, DEFAULT_FIFO_SIZE);\n\n \treturn DEFAULT_FIFO_SIZE;\n }\n@@ -426,15 +426,15 @@ static void __init mpc512x_psc_fifo_init(void)\n\n \t\tpsc = of_iomap(np, 0);\n \t\tif (!psc) {\n-\t\t\tpr_err(\"%s: Can't map %s device\\n\",\n-\t\t\t\t__func__, np->full_name);\n+\t\t\tpr_err(\"%s: Can't map %pOF device\\n\",\n+\t\t\t\t__func__, np);\n \t\t\tcontinue;\n \t\t}\n\n \t\t/* FIFO space is 4KiB, check if requested size is available */\n \t\tif ((fifobase + tx_fifo_size + rx_fifo_size) > 0x1000) {\n-\t\t\tpr_err(\"%s: no fifo space available for %s\\n\",\n-\t\t\t\t__func__, np->full_name);\n+\t\t\tpr_err(\"%s: no fifo space available for %pOF\\n\",\n+\t\t\t\t__func__, np);\n \t\t\tiounmap(psc);\n \t\t\t/*\n \t\t\t * chances are that another device requests less\ndiff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c\nindex 39b49822ace1..1ecbf176d35a 100644\n--- a/arch/powerpc/platforms/52xx/efika.c\n+++ b/arch/powerpc/platforms/52xx/efika.c\n@@ -99,7 +99,7 @@ static void __init efika_pcisetup(void)\n \tbus_range = of_get_property(pcictrl, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n \t\tprintk(KERN_WARNING EFIKA_PLATFORM_NAME\n-\t\t       \": Can't get bus-range for %s\\n\", pcictrl->full_name);\n+\t\t       \": Can't get bus-range for %pOF\\n\", pcictrl);\n \t\tgoto out_put;\n \t}\n\n@@ -109,14 +109,14 @@ static void __init efika_pcisetup(void)\n \telse\n \t\tprintk(KERN_INFO EFIKA_PLATFORM_NAME \": PCI buses %d..%d\",\n \t\t       bus_range[0], bus_range[1]);\n-\tprintk(\" controlled by %s\\n\", pcictrl->full_name);\n+\tprintk(\" controlled by %pOF\\n\", pcictrl);\n \tprintk(\"\\n\");\n\n \those = pcibios_alloc_controller(pcictrl);\n \tif (!hose) {\n \t\tprintk(KERN_WARNING EFIKA_PLATFORM_NAME\n-\t\t       \": Can't allocate PCI controller structure for %s\\n\",\n-\t\t       pcictrl->full_name);\n+\t\t       \": Can't allocate PCI controller structure for %pOF\\n\",\n+\t\t       pcictrl);\n \t\tgoto out_put;\n \t}\n\ndiff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c\nindex a3227040cc86..1fcab233d2f2 100644\n--- a/arch/powerpc/platforms/52xx/media5200.c\n+++ b/arch/powerpc/platforms/52xx/media5200.c\n@@ -156,7 +156,7 @@ static void __init media5200_init_irq(void)\n \tfpga_np = of_find_compatible_node(NULL, NULL, \"fsl,media5200-fpga\");\n \tif (!fpga_np)\n \t\tgoto out;\n-\tpr_debug(\"%s: found fpga node: %s\\n\", __func__, fpga_np->full_name);\n+\tpr_debug(\"%s: found fpga node: %pOF\\n\", __func__, fpga_np);\n\n \tmedia5200_irq.regs = of_iomap(fpga_np, 0);\n \tif (!media5200_irq.regs)\ndiff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c\nindex 22645a7c6b8a..9e974b1e1697 100644\n--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c\n+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c\n@@ -226,7 +226,7 @@ static int mpc52xx_gpt_irq_xlate(struct irq_domain *h, struct device_node *ct,\n \tdev_dbg(gpt->dev, \"%s: flags=%i\\n\", __func__, intspec[0]);\n\n \tif ((intsize < 1) || (intspec[0] > 3)) {\n-\t\tdev_err(gpt->dev, \"bad irq specifier in %s\\n\", ct->full_name);\n+\t\tdev_err(gpt->dev, \"bad irq specifier in %pOF\\n\", ct);\n \t\treturn -EINVAL;\n \t}\n\n@@ -331,7 +331,7 @@ mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)\n \tif (!of_find_property(node, \"gpio-controller\", NULL))\n \t\treturn;\n\n-\tgpt->gc.label = kstrdup(node->full_name, GFP_KERNEL);\n+\tgpt->gc.label = kasprintf(GFP_KERNEL, \"%pOF\", node);\n \tif (!gpt->gc.label) {\n \t\tdev_err(gpt->dev, \"out of memory\\n\");\n \t\treturn;\ndiff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c\nindex 00282c2b0cae..af0f79995214 100644\n--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c\n+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c\n@@ -369,19 +369,19 @@ mpc52xx_add_bridge(struct device_node *node)\n \tconst int *bus_range;\n \tstruct resource rsrc;\n\n-\tpr_debug(\"Adding MPC52xx PCI host bridge %s\\n\", node->full_name);\n+\tpr_debug(\"Adding MPC52xx PCI host bridge %pOF\\n\", node);\n\n \tpci_add_flags(PCI_REASSIGN_ALL_BUS);\n\n \tif (of_address_to_resource(node, 0, &rsrc) != 0) {\n-\t\tprintk(KERN_ERR \"Can't get %s resources\\n\", node->full_name);\n+\t\tprintk(KERN_ERR \"Can't get %pOF resources\\n\", node);\n \t\treturn -EINVAL;\n \t}\n\n \tbus_range = of_get_property(node, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get %s bus-range, assume bus 0\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get %pOF bus-range, assume bus 0\\n\",\n+\t\t       node);\n \t\tbus_range = NULL;\n \t}\n\ndiff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c\nindex 63c5ab6489c9..96bb55ca61d3 100644\n--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c\n+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c\n@@ -128,7 +128,7 @@ static int mcu_gpiochip_add(struct mcu *mcu)\n \t\treturn -ENODEV;\n\n \tgc->owner = THIS_MODULE;\n-\tgc->label = np->full_name;\n+\tgc->label = kasprintf(GFP_KERNEL, \"%pOF\", np);\n \tgc->can_sleep = 1;\n \tgc->ngpio = MCU_NUM_GPIO;\n \tgc->base = -1;\n@@ -141,6 +141,7 @@ static int mcu_gpiochip_add(struct mcu *mcu)\n\n static int mcu_gpiochip_remove(struct mcu *mcu)\n {\n+\tkfree(mcu->gc.label);\n \tgpiochip_remove(&mcu->gc);\n \treturn 0;\n }\ndiff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c\nindex d7c9b186954d..53a08d5d7db5 100644\n--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c\n+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c\n@@ -113,7 +113,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,\n unreg:\n \t\tplatform_device_del(pdev);\n err:\n-\t\tpr_err(\"%s: registration failed\\n\", np->full_name);\n+\t\tpr_err(\"%pOF: registration failed\\n\", np);\n next:\n \t\ti++;\n \t}\ndiff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c\nindex 0908abd7e36f..9fb57f78cdbe 100644\n--- a/arch/powerpc/platforms/85xx/p1022_ds.c\n+++ b/arch/powerpc/platforms/85xx/p1022_ds.c\n@@ -508,8 +508,8 @@ static void __init p1022_ds_setup_arch(void)\n \t\t\t\t * allocate one static local variable for each\n \t\t\t\t * call to this function.\n \t\t\t\t */\n-\t\t\t\tpr_info(\"p1022ds: disabling %s node\",\n-\t\t\t\t\tnp2->full_name);\n+\t\t\t\tpr_info(\"p1022ds: disabling %pOF node\",\n+\t\t\t\t\tnp2);\n \t\t\t\tof_update_property(np2, &nor_status);\n \t\t\t\tof_node_put(np2);\n \t\t\t}\n@@ -524,8 +524,8 @@ static void __init p1022_ds_setup_arch(void)\n \t\t\t\t\t.length = sizeof(\"disabled\"),\n \t\t\t\t};\n\n-\t\t\t\tpr_info(\"p1022ds: disabling %s node\",\n-\t\t\t\t\tnp2->full_name);\n+\t\t\t\tpr_info(\"p1022ds: disabling %pOF node\",\n+\t\t\t\t\tnp2);\n \t\t\t\tof_update_property(np2, &nand_status);\n \t\t\t\tof_node_put(np2);\n \t\t\t}\ndiff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c\nindex cd6ce845f398..77e618dce4a8 100644\n--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c\n+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c\n@@ -100,8 +100,8 @@ static void xes_mpc85xx_fixups(void)\n \t\terr = of_address_to_resource(np, 0, &r[0]);\n \t\tif (err) {\n \t\t\tprintk(KERN_WARNING \"xes_mpc85xx: Could not get \"\n-\t\t\t       \"resource for device tree node '%s'\",\n-\t\t\t       np->full_name);\n+\t\t\t       \"resource for device tree node '%pOF'\",\n+\t\t\t       np);\n \t\t\tcontinue;\n \t\t}\n\ndiff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c\nindex 45cb9821173c..b9d466cc2b8a 100644\n--- a/arch/powerpc/platforms/amigaone/setup.c\n+++ b/arch/powerpc/platforms/amigaone/setup.c\n@@ -40,7 +40,7 @@ static int __init amigaone_add_bridge(struct device_node *dev)\n \tconst int *bus_range;\n \tstruct pci_controller *hose;\n\n-\tprintk(KERN_INFO \"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tprintk(KERN_INFO \"Adding PCI host bridge %pOF\\n\", dev);\n\n \tcfg_addr = of_get_address(dev, 0, NULL, NULL);\n \tcfg_data = of_get_address(dev, 1, NULL, NULL);\n@@ -49,8 +49,8 @@ static int __init amigaone_add_bridge(struct device_node *dev)\n\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif ((bus_range == NULL) || (len < 2 * sizeof(int)))\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t       \" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t       \" bus 0\\n\", dev);\n\n \those = pcibios_alloc_controller(dev);\n \tif (hose == NULL)\ndiff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c\nindex 8d3ae2cc52bf..6ea3f248b155 100644\n--- a/arch/powerpc/platforms/cell/axon_msi.c\n+++ b/arch/powerpc/platforms/cell/axon_msi.c\n@@ -187,8 +187,8 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)\n\n \tirq_domain = irq_find_host(dn);\n \tif (!irq_domain) {\n-\t\tdev_dbg(&dev->dev, \"axon_msi: no irq_domain found for node %s\\n\",\n-\t\t\tdn->full_name);\n+\t\tdev_dbg(&dev->dev, \"axon_msi: no irq_domain found for node %pOF\\n\",\n+\t\t\tdn);\n \t\tgoto out_error;\n \t}\n\n@@ -326,8 +326,8 @@ static void axon_msi_shutdown(struct platform_device *device)\n \tstruct axon_msic *msic = dev_get_drvdata(&device->dev);\n \tu32 tmp;\n\n-\tpr_devel(\"axon_msi: disabling %s\\n\",\n-\t\t irq_domain_get_of_node(msic->irq_domain)->full_name);\n+\tpr_devel(\"axon_msi: disabling %pOF\\n\",\n+\t\t irq_domain_get_of_node(msic->irq_domain));\n \ttmp  = dcr_read(msic->dcr_host, MSIC_CTRL_REG);\n \ttmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;\n \tmsic_dcr_write(msic, MSIC_CTRL_REG, tmp);\n@@ -340,12 +340,12 @@ static int axon_msi_probe(struct platform_device *device)\n \tunsigned int virq;\n \tint dcr_base, dcr_len;\n\n-\tpr_devel(\"axon_msi: setting up dn %s\\n\", dn->full_name);\n+\tpr_devel(\"axon_msi: setting up dn %pOF\\n\", dn);\n\n \tmsic = kzalloc(sizeof(struct axon_msic), GFP_KERNEL);\n \tif (!msic) {\n-\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate msic for %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate msic for %pOF\\n\",\n+\t\t       dn);\n \t\tgoto out;\n \t}\n\n@@ -354,30 +354,30 @@ static int axon_msi_probe(struct platform_device *device)\n\n \tif (dcr_base == 0 || dcr_len == 0) {\n \t\tprintk(KERN_ERR\n-\t\t       \"axon_msi: couldn't parse dcr properties on %s\\n\",\n-\t\t\tdn->full_name);\n+\t\t       \"axon_msi: couldn't parse dcr properties on %pOF\\n\",\n+\t\t\tdn);\n \t\tgoto out_free_msic;\n \t}\n\n \tmsic->dcr_host = dcr_map(dn, dcr_base, dcr_len);\n \tif (!DCR_MAP_OK(msic->dcr_host)) {\n-\t\tprintk(KERN_ERR \"axon_msi: dcr_map failed for %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"axon_msi: dcr_map failed for %pOF\\n\",\n+\t\t       dn);\n \t\tgoto out_free_msic;\n \t}\n\n \tmsic->fifo_virt = dma_alloc_coherent(&device->dev, MSIC_FIFO_SIZE_BYTES,\n \t\t\t\t\t     &msic->fifo_phys, GFP_KERNEL);\n \tif (!msic->fifo_virt) {\n-\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate fifo for %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate fifo for %pOF\\n\",\n+\t\t       dn);\n \t\tgoto out_free_msic;\n \t}\n\n \tvirq = irq_of_parse_and_map(dn, 0);\n \tif (!virq) {\n-\t\tprintk(KERN_ERR \"axon_msi: irq parse and map failed for %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"axon_msi: irq parse and map failed for %pOF\\n\",\n+\t\t       dn);\n \t\tgoto out_free_fifo;\n \t}\n \tmemset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES);\n@@ -385,8 +385,8 @@ static int axon_msi_probe(struct platform_device *device)\n \t/* We rely on being able to stash a virq in a u16, so limit irqs to < 65536 */\n \tmsic->irq_domain = irq_domain_add_nomap(dn, 65536, &msic_host_ops, msic);\n \tif (!msic->irq_domain) {\n-\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate irq_domain for %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"axon_msi: couldn't allocate irq_domain for %pOF\\n\",\n+\t\t       dn);\n \t\tgoto out_free_fifo;\n \t}\n\n@@ -412,7 +412,7 @@ static int axon_msi_probe(struct platform_device *device)\n\n \taxon_msi_debug_setup(dn, msic);\n\n-\tprintk(KERN_DEBUG \"axon_msi: setup MSIC on %s\\n\", dn->full_name);\n+\tprintk(KERN_DEBUG \"axon_msi: setup MSIC on %pOF\\n\", dn);\n\n \treturn 0;\n\ndiff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c\nindex 871d38479a25..6fc85e29dc08 100644\n--- a/arch/powerpc/platforms/cell/interrupt.c\n+++ b/arch/powerpc/platforms/cell/interrupt.c\n@@ -303,8 +303,8 @@ static void __init init_one_iic(unsigned int hw_cpu, unsigned long addr,\n \tiic->node = of_node_get(node);\n \tout_be64(&iic->regs->prio, 0);\n\n-\tprintk(KERN_INFO \"IIC for CPU %d target id 0x%x : %s\\n\",\n-\t       hw_cpu, iic->target_id, node->full_name);\n+\tprintk(KERN_INFO \"IIC for CPU %d target id 0x%x : %pOF\\n\",\n+\t       hw_cpu, iic->target_id, node);\n }\n\n static int __init setup_iic(void)\ndiff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c\nindex 29d4f96ed33e..4b91ad08eefd 100644\n--- a/arch/powerpc/platforms/cell/iommu.c\n+++ b/arch/powerpc/platforms/cell/iommu.c\n@@ -278,8 +278,8 @@ static int cell_iommu_find_ioc(int nid, unsigned long *base)\n \t\tif (of_node_to_nid(np) != nid)\n \t\t\tcontinue;\n \t\tif (of_address_to_resource(np, 0, &r)) {\n-\t\t\tprintk(KERN_ERR \"iommu: can't get address for %s\\n\",\n-\t\t\t       np->full_name);\n+\t\t\tprintk(KERN_ERR \"iommu: can't get address for %pOF\\n\",\n+\t\t\t       np);\n \t\t\tcontinue;\n \t\t}\n \t\t*base = r.start;\n@@ -458,8 +458,8 @@ static inline u32 cell_iommu_get_ioid(struct device_node *np)\n\n \tioid = of_get_property(np, \"ioid\", NULL);\n \tif (ioid == NULL) {\n-\t\tprintk(KERN_WARNING \"iommu: missing ioid for %s using 0\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_WARNING \"iommu: missing ioid for %pOF using 0\\n\",\n+\t\t       np);\n \t\treturn 0;\n \t}\n\n@@ -559,8 +559,8 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)\n \t */\n \tiommu = cell_iommu_for_node(dev_to_node(dev));\n \tif (iommu == NULL || list_empty(&iommu->windows)) {\n-\t\tdev_err(dev, \"iommu: missing iommu for %s (node %d)\\n\",\n-\t\t       of_node_full_name(dev->of_node), dev_to_node(dev));\n+\t\tdev_err(dev, \"iommu: missing iommu for %pOF (node %d)\\n\",\n+\t\t       dev->of_node, dev_to_node(dev));\n \t\treturn NULL;\n \t}\n \twindow = list_entry(iommu->windows.next, struct iommu_window, list);\n@@ -720,12 +720,12 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np)\n \t/* Get node ID */\n \tnid = of_node_to_nid(np);\n \tif (nid < 0) {\n-\t\tprintk(KERN_ERR \"iommu: failed to get node for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"iommu: failed to get node for %pOF\\n\",\n+\t\t       np);\n \t\treturn NULL;\n \t}\n-\tpr_debug(\"iommu: setting up iommu for node %d (%s)\\n\",\n-\t\t nid, np->full_name);\n+\tpr_debug(\"iommu: setting up iommu for node %d (%pOF)\\n\",\n+\t\t nid, np);\n\n \t/* XXX todo: If we can have multiple windows on the same IOMMU, which\n \t * isn't the case today, we probably want here to check whether the\n@@ -736,8 +736,8 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np)\n \t */\n\n \tif (cbe_nr_iommus >= NR_IOMMUS) {\n-\t\tprintk(KERN_ERR \"iommu: too many IOMMUs detected ! (%s)\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"iommu: too many IOMMUs detected ! (%pOF)\\n\",\n+\t\t       np);\n \t\treturn NULL;\n \t}\n\ndiff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c\nindex 460ab392f0e7..2f704afe9af3 100644\n--- a/arch/powerpc/platforms/cell/ras.c\n+++ b/arch/powerpc/platforms/cell/ras.c\n@@ -196,8 +196,8 @@ static int __init cbe_ptcal_enable(void)\n \tfor_each_node_by_type(np, \"cpu\") {\n \t\tconst u32 *nid = of_get_property(np, \"node-id\", NULL);\n \t\tif (!nid) {\n-\t\t\tprintk(KERN_ERR \"%s: node %s is missing node-id?\\n\",\n-\t\t\t\t\t__func__, np->full_name);\n+\t\t\tprintk(KERN_ERR \"%s: node %pOF is missing node-id?\\n\",\n+\t\t\t\t\t__func__, np);\n \t\t\tcontinue;\n \t\t}\n \t\tcbe_ptcal_enable_on_node(*nid, order);\ndiff --git a/arch/powerpc/platforms/cell/spider-pci.c b/arch/powerpc/platforms/cell/spider-pci.c\nindex f1f7878893f3..d1e61e273e64 100644\n--- a/arch/powerpc/platforms/cell/spider-pci.c\n+++ b/arch/powerpc/platforms/cell/spider-pci.c\n@@ -130,8 +130,8 @@ int __init spiderpci_iowa_init(struct iowa_bus *bus, void *data)\n \tstruct resource r;\n \tunsigned long offset = (unsigned long)data;\n\n-\tpr_debug(\"SPIDERPCI-IOWA:Bus initialize for spider(%s)\\n\",\n-\t\t np->full_name);\n+\tpr_debug(\"SPIDERPCI-IOWA:Bus initialize for spider(%pOF)\\n\",\n+\t\t np);\n\n \tpriv = kzalloc(sizeof(struct spiderpci_iowa_private), GFP_KERNEL);\n \tif (!priv) {\ndiff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c\nindex ff924af00e78..aa44bfc46467 100644\n--- a/arch/powerpc/platforms/cell/spider-pic.c\n+++ b/arch/powerpc/platforms/cell/spider-pic.c\n@@ -323,8 +323,8 @@ static void __init spider_init_one(struct device_node *of_node, int chip,\n \tirq_set_handler_data(virq, pic);\n \tirq_set_chained_handler(virq, spider_irq_cascade);\n\n-\tprintk(KERN_INFO \"spider_pic: node %d, addr: 0x%lx %s\\n\",\n-\t       pic->node_id, addr, of_node->full_name);\n+\tprintk(KERN_INFO \"spider_pic: node %d, addr: 0x%lx %pOF\\n\",\n+\t       pic->node_id, addr, of_node);\n\n \t/* Enable the interrupt detection enable bit. Do this last! */\n \tout_be32(pic->regs + TIR_DEN, in_be32(pic->regs + TIR_DEN) | 0x1);\ndiff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c\nindex 672d310dcf14..f636ee22b203 100644\n--- a/arch/powerpc/platforms/cell/spu_manage.c\n+++ b/arch/powerpc/platforms/cell/spu_manage.c\n@@ -191,8 +191,8 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)\n \t\t\tgoto err;\n \t\t}\n \t\tret = -EINVAL;\n-\t\tpr_debug(\"  irq %d no 0x%x on %s\\n\", i, oirq.args[0],\n-\t\t\t oirq.np->full_name);\n+\t\tpr_debug(\"  irq %d no 0x%x on %pOF\\n\", i, oirq.args[0],\n+\t\t\t oirq.np);\n \t\tspu->irqs[i] = irq_create_of_mapping(&oirq);\n \t\tif (!spu->irqs[i]) {\n \t\t\tpr_debug(\"spu_new: failed to map it !\\n\");\n@@ -243,32 +243,32 @@ static int __init spu_map_device(struct spu *spu)\n \tret = spu_map_resource(spu, 0, (void __iomem**)&spu->local_store,\n \t\t\t       &spu->local_store_phys);\n \tif (ret) {\n-\t\tpr_debug(\"spu_new: failed to map %s resource 0\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_debug(\"spu_new: failed to map %pOF resource 0\\n\",\n+\t\t\t np);\n \t\tgoto out;\n \t}\n \tret = spu_map_resource(spu, 1, (void __iomem**)&spu->problem,\n \t\t\t       &spu->problem_phys);\n \tif (ret) {\n-\t\tpr_debug(\"spu_new: failed to map %s resource 1\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_debug(\"spu_new: failed to map %pOF resource 1\\n\",\n+\t\t\t np);\n \t\tgoto out_unmap;\n \t}\n \tret = spu_map_resource(spu, 2, (void __iomem**)&spu->priv2, NULL);\n \tif (ret) {\n-\t\tpr_debug(\"spu_new: failed to map %s resource 2\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_debug(\"spu_new: failed to map %pOF resource 2\\n\",\n+\t\t\t np);\n \t\tgoto out_unmap;\n \t}\n \tif (!firmware_has_feature(FW_FEATURE_LPAR))\n \t\tret = spu_map_resource(spu, 3,\n \t\t\t       (void __iomem**)&spu->priv1, NULL);\n \tif (ret) {\n-\t\tpr_debug(\"spu_new: failed to map %s resource 3\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_debug(\"spu_new: failed to map %pOF resource 3\\n\",\n+\t\t\t np);\n \t\tgoto out_unmap;\n \t}\n-\tpr_debug(\"spu_new: %s maps:\\n\", np->full_name);\n+\tpr_debug(\"spu_new: %pOF maps:\\n\", np);\n \tpr_debug(\"  local store   : 0x%016lx -> 0x%p\\n\",\n \t\t spu->local_store_phys, spu->local_store);\n \tpr_debug(\"  problem state : 0x%016lx -> 0x%p\\n\",\n@@ -316,8 +316,8 @@ static int __init of_create_spu(struct spu *spu, void *data)\n\n \tspu->node = of_node_to_nid(spe);\n \tif (spu->node >= MAX_NUMNODES) {\n-\t\tprintk(KERN_WARNING \"SPE %s on node %d ignored,\"\n-\t\t       \" node number too big\\n\", spe->full_name, spu->node);\n+\t\tprintk(KERN_WARNING \"SPE %pOF on node %d ignored,\"\n+\t\t       \" node number too big\\n\", spe, spu->node);\n \t\tprintk(KERN_WARNING \"Check if CONFIG_NUMA is enabled.\\n\");\n \t\tret = -ENODEV;\n \t\tgoto out;\ndiff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c\nindex 1b87e198faa7..27264794f5c0 100644\n--- a/arch/powerpc/platforms/chrp/pci.c\n+++ b/arch/powerpc/platforms/chrp/pci.c\n@@ -235,14 +235,14 @@ chrp_find_bridges(void)\n \t\t++index;\n \t\t/* The GG2 bridge on the LongTrail doesn't have an address */\n \t\tif (of_address_to_resource(dev, 0, &r) && !is_longtrail) {\n-\t\t\tprintk(KERN_WARNING \"Can't use %s: no address\\n\",\n-\t\t\t       dev->full_name);\n+\t\t\tprintk(KERN_WARNING \"Can't use %pOF: no address\\n\",\n+\t\t\t       dev);\n \t\t\tcontinue;\n \t\t}\n \t\tbus_range = of_get_property(dev, \"bus-range\", &len);\n \t\tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\t\tprintk(KERN_WARNING \"Can't get bus-range for %s\\n\",\n-\t\t\t\tdev->full_name);\n+\t\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF\\n\",\n+\t\t\t\tdev);\n \t\t\tcontinue;\n \t\t}\n \t\tif (bus_range[1] == bus_range[0])\n@@ -250,15 +250,15 @@ chrp_find_bridges(void)\n \t\telse\n \t\t\tprintk(KERN_INFO \"PCI buses %d..%d\",\n \t\t\t       bus_range[0], bus_range[1]);\n-\t\tprintk(\" controlled by %s\", dev->full_name);\n+\t\tprintk(\" controlled by %pOF\", dev);\n \t\tif (!is_longtrail)\n \t\t\tprintk(\" at %llx\", (unsigned long long)r.start);\n \t\tprintk(\"\\n\");\n\n \t\those = pcibios_alloc_controller(dev);\n \t\tif (!hose) {\n-\t\t\tprintk(\"Can't allocate PCI controller structure for %s\\n\",\n-\t\t\t\tdev->full_name);\n+\t\t\tprintk(\"Can't allocate PCI controller structure for %pOF\\n\",\n+\t\t\t\tdev);\n \t\t\tcontinue;\n \t\t}\n \t\those->first_busno = hose->self_busno = bus_range[0];\n@@ -297,8 +297,8 @@ chrp_find_bridges(void)\n \t\t\t\t}\n \t\t\t}\n \t\t} else {\n-\t\t\tprintk(\"No methods for %s (model %s), using RTAS\\n\",\n-\t\t\t       dev->full_name, model);\n+\t\t\tprintk(\"No methods for %pOF (model %s), using RTAS\\n\",\n+\t\t\t       dev, model);\n \t\t\those->ops = &rtas_pci_ops;\n \t\t}\n\ndiff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c\nindex f29cf29b11f8..f514d5d28cd4 100644\n--- a/arch/powerpc/platforms/embedded6xx/linkstation.c\n+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c\n@@ -41,12 +41,12 @@ static int __init linkstation_add_bridge(struct device_node *dev)\n \tstruct pci_controller *hose;\n \tconst int *bus_range;\n\n-\tprintk(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tprintk(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int))\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t\t\t\" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t\t\t\" bus 0\\n\", dev);\n\n \those = pcibios_alloc_controller(dev);\n \tif (hose == NULL)\ndiff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c\nindex 8e3590941960..273dfa3f0252 100644\n--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c\n+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c\n@@ -115,7 +115,7 @@ static int __init mvme5100_add_bridge(struct device_node *dev)\n \tstruct pci_controller\t*hose;\n \tunsigned short\t\tdevid;\n\n-\tpr_info(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tpr_info(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n\ndiff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c\nindex 471a50bcd074..ed1914dd34bb 100644\n--- a/arch/powerpc/platforms/embedded6xx/storcenter.c\n+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c\n@@ -44,7 +44,7 @@ static int __init storcenter_add_bridge(struct device_node *dev)\n \tstruct pci_controller *hose;\n \tconst int *bus_range;\n\n-\tprintk(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tprintk(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \those = pcibios_alloc_controller(dev);\n \tif (hose == NULL)\ndiff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c\nindex 69794d9389c2..e3821379e86f 100644\n--- a/arch/powerpc/platforms/maple/pci.c\n+++ b/arch/powerpc/platforms/maple/pci.c\n@@ -73,8 +73,8 @@ static void __init fixup_bus_range(struct device_node *bridge)\n \t/* Lookup the \"bus-range\" property for the hose */\n \tprop = of_find_property(bridge, \"bus-range\", &len);\n \tif (prop == NULL  || prop->value == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s\\n\",\n-\t\t\t       bridge->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF\\n\",\n+\t\t\t       bridge);\n \t\treturn;\n \t}\n \tbus_range = prop->value;\n@@ -498,12 +498,12 @@ static int __init maple_add_bridge(struct device_node *dev)\n \tconst int *bus_range;\n \tint primary = 1;\n\n-\tDBG(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tDBG(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume bus 0\\n\",\n-\t\tdev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume bus 0\\n\",\n+\t\tdev);\n \t}\n\n \those = pcibios_alloc_controller(dev);\ndiff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c\nindex 10c4e8fc6ea9..5ff6108f19e9 100644\n--- a/arch/powerpc/platforms/pasemi/pci.c\n+++ b/arch/powerpc/platforms/pasemi/pci.c\n@@ -193,7 +193,7 @@ static int __init pas_add_bridge(struct device_node *dev)\n {\n \tstruct pci_controller *hose;\n\n-\tpr_debug(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tpr_debug(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \those = pcibios_alloc_controller(dev);\n \tif (!hose)\ndiff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c\nindex 1e02328c3f2d..9e3f39d36e88 100644\n--- a/arch/powerpc/platforms/powermac/feature.c\n+++ b/arch/powerpc/platforms/powermac/feature.c\n@@ -2658,25 +2658,25 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ\n\n \tif (i >= MAX_MACIO_CHIPS) {\n \t\tprintk(KERN_ERR \"pmac_feature: Please increase MAX_MACIO_CHIPS !\\n\");\n-\t\tprintk(KERN_ERR \"pmac_feature: %s skipped\\n\", node->full_name);\n+\t\tprintk(KERN_ERR \"pmac_feature: %pOF skipped\\n\", node);\n \t\treturn;\n \t}\n \taddrp = of_get_pci_address(node, 0, &size, NULL);\n \tif (addrp == NULL) {\n-\t\tprintk(KERN_ERR \"pmac_feature: %s: can't find base !\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_ERR \"pmac_feature: %pOF: can't find base !\\n\",\n+\t\t       node);\n \t\treturn;\n \t}\n \taddr = of_translate_address(node, addrp);\n \tif (addr == 0) {\n-\t\tprintk(KERN_ERR \"pmac_feature: %s, can't translate base !\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_ERR \"pmac_feature: %pOF, can't translate base !\\n\",\n+\t\t       node);\n \t\treturn;\n \t}\n \tbase = ioremap(addr, (unsigned long)size);\n \tif (!base) {\n-\t\tprintk(KERN_ERR \"pmac_feature: %s, can't map mac-io chip !\\n\",\n-\t\t       node->full_name);\n+\t\tprintk(KERN_ERR \"pmac_feature: %pOF, can't map mac-io chip !\\n\",\n+\t\t       node);\n \t\treturn;\n \t}\n \tif (type == macio_keylargo || type == macio_keylargo2) {\ndiff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c\nindex f627c9fd7b48..70183eb3d5c8 100644\n--- a/arch/powerpc/platforms/powermac/low_i2c.c\n+++ b/arch/powerpc/platforms/powermac/low_i2c.c\n@@ -494,8 +494,8 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)\n\n \thost = kzalloc(sizeof(struct pmac_i2c_host_kw), GFP_KERNEL);\n \tif (host == NULL) {\n-\t\tprintk(KERN_ERR \"low_i2c: Can't allocate host for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"low_i2c: Can't allocate host for %pOF\\n\",\n+\t\t       np);\n \t\treturn NULL;\n \t}\n\n@@ -505,8 +505,8 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)\n \t */\n \taddrp = of_get_property(np, \"AAPL,address\", NULL);\n \tif (addrp == NULL) {\n-\t\tprintk(KERN_ERR \"low_i2c: Can't find address for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"low_i2c: Can't find address for %pOF\\n\",\n+\t\t       np);\n \t\tkfree(host);\n \t\treturn NULL;\n \t}\n@@ -538,13 +538,13 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)\n \thost->irq = irq_of_parse_and_map(np, 0);\n \tif (!host->irq)\n \t\tprintk(KERN_WARNING\n-\t\t       \"low_i2c: Failed to map interrupt for %s\\n\",\n-\t\t       np->full_name);\n+\t\t       \"low_i2c: Failed to map interrupt for %pOF\\n\",\n+\t\t       np);\n\n \thost->base = ioremap((*addrp), 0x1000);\n \tif (host->base == NULL) {\n-\t\tprintk(KERN_ERR \"low_i2c: Can't map registers for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"low_i2c: Can't map registers for %pOF\\n\",\n+\t\t       np);\n \t\tkfree(host);\n \t\treturn NULL;\n \t}\n@@ -560,8 +560,8 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)\n \t\t\t\"keywest i2c\", host))\n \t\thost->irq = 0;\n\n-\tprintk(KERN_INFO \"KeyWest i2c @0x%08x irq %d %s\\n\",\n-\t       *addrp, host->irq, np->full_name);\n+\tprintk(KERN_INFO \"KeyWest i2c @0x%08x irq %d %pOF\\n\",\n+\t       *addrp, host->irq, np);\n\n \treturn host;\n }\n@@ -798,7 +798,7 @@ static void __init pmu_i2c_probe(void)\n \tif (busnode == NULL)\n \t\treturn;\n\n-\tprintk(KERN_INFO \"PMU i2c %s\\n\", busnode->full_name);\n+\tprintk(KERN_INFO \"PMU i2c %pOF\\n\", busnode);\n\n \t/*\n \t * We add bus 1 and 2 only for now, bus 0 is \"special\"\n@@ -913,7 +913,7 @@ static void __init smu_i2c_probe(void)\n \tif (controller == NULL)\n \t\treturn;\n\n-\tprintk(KERN_INFO \"SMU i2c %s\\n\", controller->full_name);\n+\tprintk(KERN_INFO \"SMU i2c %pOF\\n\", controller);\n\n \t/* Look for childs, note that they might not be of the right\n \t * type as older device trees mix i2c busses and other things\n@@ -945,8 +945,8 @@ static void __init smu_i2c_probe(void)\n \t\tbus->flags = 0;\n \t\tlist_add(&bus->link, &pmac_i2c_busses);\n\n-\t\tprintk(KERN_INFO \" channel %x bus %s\\n\",\n-\t\t       bus->channel, busnode->full_name);\n+\t\tprintk(KERN_INFO \" channel %x bus %pOF\\n\",\n+\t\t       bus->channel, busnode);\n \t}\n }\n\n@@ -1129,7 +1129,7 @@ int pmac_i2c_setmode(struct pmac_i2c_bus *bus, int mode)\n \t */\n \tif (mode < pmac_i2c_mode_dumb || mode > pmac_i2c_mode_combined) {\n \t\tprintk(KERN_ERR \"low_i2c: Invalid mode %d requested on\"\n-\t\t       \" bus %s !\\n\", mode, bus->busnode->full_name);\n+\t\t       \" bus %pOF !\\n\", mode, bus->busnode);\n \t\treturn -EINVAL;\n \t}\n \tbus->mode = mode;\n@@ -1146,8 +1146,8 @@ int pmac_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,\n \tWARN_ON(!bus->opened);\n\n \tDBG(\"xfer() chan=%d, addrdir=0x%x, mode=%d, subsize=%d, subaddr=0x%x,\"\n-\t    \" %d bytes, bus %s\\n\", bus->channel, addrdir, bus->mode, subsize,\n-\t    subaddr, len, bus->busnode->full_name);\n+\t    \" %d bytes, bus %pOF\\n\", bus->channel, addrdir, bus->mode, subsize,\n+\t    subaddr, len, bus->busnode);\n\n \trc = bus->xfer(bus, addrdir, subsize, subaddr, data, len);\n\n@@ -1241,13 +1241,13 @@ static void* pmac_i2c_do_begin(struct pmf_function *func, struct pmf_args *args)\n\n \tbus = pmac_i2c_find_bus(func->node);\n \tif (bus == NULL) {\n-\t\tprintk(KERN_ERR \"low_i2c: Can't find bus for %s (pfunc)\\n\",\n-\t\t       func->node->full_name);\n+\t\tprintk(KERN_ERR \"low_i2c: Can't find bus for %pOF (pfunc)\\n\",\n+\t\t       func->node);\n \t\treturn NULL;\n \t}\n \tif (pmac_i2c_open(bus, 0)) {\n-\t\tprintk(KERN_ERR \"low_i2c: Can't open i2c bus for %s (pfunc)\\n\",\n-\t\t       func->node->full_name);\n+\t\tprintk(KERN_ERR \"low_i2c: Can't open i2c bus for %pOF (pfunc)\\n\",\n+\t\t       func->node);\n \t\treturn NULL;\n \t}\n\n@@ -1417,7 +1417,7 @@ static struct pmf_handlers pmac_i2c_pfunc_handlers = {\n\n static void __init pmac_i2c_dev_create(struct device_node *np, int quirks)\n {\n-\tDBG(\"dev_create(%s)\\n\", np->full_name);\n+\tDBG(\"dev_create(%pOF)\\n\", np);\n\n \tpmf_register_driver(np, &pmac_i2c_pfunc_handlers,\n \t\t\t    (void *)(long)quirks);\n@@ -1425,20 +1425,20 @@ static void __init pmac_i2c_dev_create(struct device_node *np, int quirks)\n\n static void __init pmac_i2c_dev_init(struct device_node *np, int quirks)\n {\n-\tDBG(\"dev_create(%s)\\n\", np->full_name);\n+\tDBG(\"dev_create(%pOF)\\n\", np);\n\n \tpmf_do_functions(np, NULL, 0, PMF_FLAGS_ON_INIT, NULL);\n }\n\n static void pmac_i2c_dev_suspend(struct device_node *np, int quirks)\n {\n-\tDBG(\"dev_suspend(%s)\\n\", np->full_name);\n+\tDBG(\"dev_suspend(%pOF)\\n\", np);\n \tpmf_do_functions(np, NULL, 0, PMF_FLAGS_ON_SLEEP, NULL);\n }\n\n static void pmac_i2c_dev_resume(struct device_node *np, int quirks)\n {\n-\tDBG(\"dev_resume(%s)\\n\", np->full_name);\n+\tDBG(\"dev_resume(%pOF)\\n\", np);\n \tpmf_do_functions(np, NULL, 0, PMF_FLAGS_ON_WAKE, NULL);\n }\n\ndiff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c\nindex 6e06c3be2e9a..0b8174a79993 100644\n--- a/arch/powerpc/platforms/powermac/pci.c\n+++ b/arch/powerpc/platforms/powermac/pci.c\n@@ -783,7 +783,7 @@ static int __init pmac_add_bridge(struct device_node *dev)\n \tconst int *bus_range;\n \tint primary = 1, has_address = 0;\n\n-\tDBG(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tDBG(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \t/* Fetch host bridge registers address */\n \thas_address = (of_address_to_resource(dev, 0, &rsrc) == 0);\n@@ -791,8 +791,8 @@ static int __init pmac_add_bridge(struct device_node *dev)\n \t/* Get bus range if any */\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t       \" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t       \" bus 0\\n\", dev);\n \t}\n\n \those = pcibios_alloc_controller(dev);\ndiff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c\nindex 459138ed4571..860159d46ab8 100644\n--- a/arch/powerpc/platforms/powermac/pfunc_base.c\n+++ b/arch/powerpc/platforms/powermac/pfunc_base.c\n@@ -54,8 +54,8 @@ static int macio_do_gpio_write(PMF_STD_ARGS, u8 value, u8 mask)\n \traw_spin_lock_irqsave(&feature_lock, flags);\n \ttmp = readb(addr);\n \ttmp = (tmp & ~mask) | (value & mask);\n-\tDBG(\"Do write 0x%02x to GPIO %s (%p)\\n\",\n-\t    tmp, func->node->full_name, addr);\n+\tDBG(\"Do write 0x%02x to GPIO %pOF (%p)\\n\",\n+\t    tmp, func->node, addr);\n \twriteb(tmp, addr);\n \traw_spin_unlock_irqrestore(&feature_lock, flags);\n\n@@ -107,8 +107,8 @@ static void macio_gpio_init_one(struct macio_chip *macio)\n \tif (gparent == NULL)\n \t\treturn;\n\n-\tDBG(\"Installing GPIO functions for macio %s\\n\",\n-\t    macio->of_node->full_name);\n+\tDBG(\"Installing GPIO functions for macio %pOF\\n\",\n+\t    macio->of_node);\n\n \t/*\n \t * Ok, got one, we dont need anything special to track them down, so\n@@ -129,8 +129,8 @@ static void macio_gpio_init_one(struct macio_chip *macio)\n \t\tpmf_register_driver(gp, &macio_gpio_handlers, (void *)offset);\n \t}\n\n-\tDBG(\"Calling initial GPIO functions for macio %s\\n\",\n-\t    macio->of_node->full_name);\n+\tDBG(\"Calling initial GPIO functions for macio %pOF\\n\",\n+\t    macio->of_node);\n\n \t/* And now we run all the init ones */\n \tfor (gp = NULL; (gp = of_get_next_child(gparent, gp)) != NULL;)\n@@ -267,8 +267,8 @@ static struct pmf_handlers macio_mmio_handlers = {\n\n static void macio_mmio_init_one(struct macio_chip *macio)\n {\n-\tDBG(\"Installing MMIO functions for macio %s\\n\",\n-\t    macio->of_node->full_name);\n+\tDBG(\"Installing MMIO functions for macio %pOF\\n\",\n+\t    macio->of_node);\n\n \tpmf_register_driver(macio->of_node, &macio_mmio_handlers, macio);\n }\n@@ -298,8 +298,8 @@ static void uninorth_install_pfunc(void)\n {\n \tstruct device_node *np;\n\n-\tDBG(\"Installing functions for UniN %s\\n\",\n-\t    uninorth_node->full_name);\n+\tDBG(\"Installing functions for UniN %pOF\\n\",\n+\t    uninorth_node);\n\n \t/*\n \t * Install handlers for the bridge itself\n@@ -317,8 +317,8 @@ static void uninorth_install_pfunc(void)\n \t\t\tbreak;\n \t\t}\n \tif (unin_hwclock) {\n-\t\tDBG(\"Installing functions for UniN clock %s\\n\",\n-\t\t    unin_hwclock->full_name);\n+\t\tDBG(\"Installing functions for UniN clock %pOF\\n\",\n+\t\t    unin_hwclock);\n \t\tpmf_register_driver(unin_hwclock, &unin_mmio_handlers, NULL);\n \t\tpmf_do_functions(unin_hwclock, NULL, 0, PMF_FLAGS_ON_INIT,\n \t\t\t\t NULL);\ndiff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c\nindex 695e8c4d4224..df3c93bef228 100644\n--- a/arch/powerpc/platforms/powermac/pfunc_core.c\n+++ b/arch/powerpc/platforms/powermac/pfunc_core.c\n@@ -708,7 +708,7 @@ int pmf_register_driver(struct device_node *np,\n \tif (handlers == NULL)\n \t\treturn -EINVAL;\n\n-\tDBG(\"pmf: registering driver for node %s\\n\", np->full_name);\n+\tDBG(\"pmf: registering driver for node %pOF\\n\", np);\n\n \tspin_lock_irqsave(&pmf_lock, flags);\n \tdev = pmf_find_device(np);\n@@ -781,7 +781,7 @@ void pmf_unregister_driver(struct device_node *np)\n \tstruct pmf_device *dev;\n \tunsigned long flags;\n\n-\tDBG(\"pmf: unregistering driver for node %s\\n\", np->full_name);\n+\tDBG(\"pmf: unregistering driver for node %pOF\\n\", np);\n\n \tspin_lock_irqsave(&pmf_lock, flags);\n \tdev = pmf_find_device(np);\n@@ -940,7 +940,7 @@ int pmf_call_one(struct pmf_function *func, struct pmf_args *args)\n \tvoid *instdata = NULL;\n \tint rc = 0;\n\n-\tDBG(\" ** pmf_call_one(%s/%s) **\\n\", dev->node->full_name, func->name);\n+\tDBG(\" ** pmf_call_one(%pOF/%s) **\\n\", dev->node, func->name);\n\n \tif (dev->handlers->begin)\n \t\tinstdata = dev->handlers->begin(func, args);\ndiff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c\nindex f5f9ad7c3398..5e0719b27294 100644\n--- a/arch/powerpc/platforms/powermac/pic.c\n+++ b/arch/powerpc/platforms/powermac/pic.c\n@@ -364,8 +364,8 @@ static void __init pmac_pic_probe_oldstyle(void)\n \t\t\t(addr + 0x10);\n \tof_node_put(master);\n\n-\tprintk(KERN_INFO \"irq: Found primary Apple PIC %s for %d irqs\\n\",\n-\t       master->full_name, max_real_irqs);\n+\tprintk(KERN_INFO \"irq: Found primary Apple PIC %pOF for %d irqs\\n\",\n+\t       master, max_real_irqs);\n\n \t/* Map interrupts of cascaded controller */\n \tif (slave && !of_address_to_resource(slave, 0, &r)) {\n@@ -378,8 +378,8 @@ static void __init pmac_pic_probe_oldstyle(void)\n \t\t\t\t(addr + 0x10);\n \t\tpmac_irq_cascade = irq_of_parse_and_map(slave, 0);\n\n-\t\tprintk(KERN_INFO \"irq: Found slave Apple PIC %s for %d irqs\"\n-\t\t       \" cascade: %d\\n\", slave->full_name,\n+\t\tprintk(KERN_INFO \"irq: Found slave Apple PIC %pOF for %d irqs\"\n+\t\t       \" cascade: %d\\n\", slave,\n \t\t       max_irqs - max_real_irqs, pmac_irq_cascade);\n \t}\n \tof_node_put(slave);\ndiff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c\nindex 6b4e9d181126..ab668cb72263 100644\n--- a/arch/powerpc/platforms/powermac/setup.c\n+++ b/arch/powerpc/platforms/powermac/setup.c\n@@ -556,7 +556,7 @@ static int __init check_pmac_serial_console(void)\n \t\tpr_debug(\" can't find stdout package %s !\\n\", name);\n \t\treturn -ENODEV;\n \t}\n-\tpr_debug(\"stdout is %s\\n\", prom_stdout->full_name);\n+\tpr_debug(\"stdout is %pOF\\n\", prom_stdout);\n\n \tname = of_get_property(prom_stdout, \"name\", NULL);\n \tif (!name) {\ndiff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c\nindex 83bebeec0fea..cf33769a7b72 100644\n--- a/arch/powerpc/platforms/powernv/opal-async.c\n+++ b/arch/powerpc/platforms/powernv/opal-async.c\n@@ -171,8 +171,8 @@ int __init opal_async_comp_init(void)\n\n \tasync = of_get_property(opal_node, \"opal-msg-async-num\", NULL);\n \tif (!async) {\n-\t\tpr_err(\"%s: %s has no opal-msg-async-num\\n\",\n-\t\t\t\t__func__, opal_node->full_name);\n+\t\tpr_err(\"%s: %pOF has no opal-msg-async-num\\n\",\n+\t\t\t\t__func__, opal_node);\n \t\terr = -ENOENT;\n \t\tgoto out_opal_node;\n \t}\ndiff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c\nindex 28651fb25417..81c0a943dea9 100644\n--- a/arch/powerpc/platforms/powernv/opal-xscom.c\n+++ b/arch/powerpc/platforms/powernv/opal-xscom.c\n@@ -36,14 +36,14 @@ static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count)\n \tconst __be32 *gcid;\n\n \tif (!of_get_property(dev, \"scom-controller\", NULL)) {\n-\t\tpr_err(\"%s: device %s is not a SCOM controller\\n\",\n-\t\t\t__func__, dev->full_name);\n+\t\tpr_err(\"%s: device %pOF is not a SCOM controller\\n\",\n+\t\t\t__func__, dev);\n \t\treturn SCOM_MAP_INVALID;\n \t}\n \tgcid = of_get_property(dev, \"ibm,chip-id\", NULL);\n \tif (!gcid) {\n-\t\tpr_err(\"%s: device %s has no ibm,chip-id\\n\",\n-\t\t\t__func__, dev->full_name);\n+\t\tpr_err(\"%s: device %pOF has no ibm,chip-id\\n\",\n+\t\t\t__func__, dev);\n \t\treturn SCOM_MAP_INVALID;\n \t}\n \tm = kmalloc(sizeof(struct opal_scom_map), GFP_KERNEL);\ndiff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c\nindex 437613588df1..aaa730ff28bc 100644\n--- a/arch/powerpc/platforms/powernv/pci-ioda.c\n+++ b/arch/powerpc/platforms/powernv/pci-ioda.c\n@@ -444,8 +444,8 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)\n\n \tr = of_get_property(dn, \"ibm,opal-m64-window\", NULL);\n \tif (!r) {\n-\t\tpr_info(\"  No <ibm,opal-m64-window> on %s\\n\",\n-\t\t\tdn->full_name);\n+\t\tpr_info(\"  No <ibm,opal-m64-window> on %pOF\\n\",\n+\t\t\tdn);\n \t\treturn;\n \t}\n\n@@ -3789,8 +3789,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,\n \tif (!of_device_is_available(np))\n \t\treturn;\n\n-\tpr_info(\"Initializing %s PHB (%s)\\n\",\n-\t\tpnv_phb_names[ioda_type], of_node_full_name(np));\n+\tpr_info(\"Initializing %s PHB (%pOF)\\n\",\tpnv_phb_names[ioda_type], np);\n\n \tprop64 = of_get_property(np, \"ibm,opal-phbid\", NULL);\n \tif (!prop64) {\n@@ -3805,8 +3804,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,\n \t/* Allocate PCI controller */\n \tphb->hose = hose = pcibios_alloc_controller(np);\n \tif (!phb->hose) {\n-\t\tpr_err(\"  Can't allocate PCI controller for %s\\n\",\n-\t\t       np->full_name);\n+\t\tpr_err(\"  Can't allocate PCI controller for %pOF\\n\",\n+\t\t       np);\n \t\tmemblock_free(__pa(phb), sizeof(struct pnv_phb));\n \t\treturn;\n \t}\n@@ -3817,7 +3816,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,\n \t\those->first_busno = be32_to_cpu(prop32[0]);\n \t\those->last_busno = be32_to_cpu(prop32[1]);\n \t} else {\n-\t\tpr_warn(\"  Broken <bus-range> on %s\\n\", np->full_name);\n+\t\tpr_warn(\"  Broken <bus-range> on %pOF\\n\", np);\n \t\those->first_busno = 0;\n \t\those->last_busno = 0xff;\n \t}\n@@ -4038,7 +4037,7 @@ void __init pnv_pci_init_ioda_hub(struct device_node *np)\n \tconst __be64 *prop64;\n \tu64 hub_id;\n\n-\tpr_info(\"Probing IODA IO-Hub %s\\n\", np->full_name);\n+\tpr_info(\"Probing IODA IO-Hub %pOF\\n\", np);\n\n \tprop64 = of_get_property(np, \"ibm,opal-hubid\", NULL);\n \tif (!prop64) {\ndiff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c\nindex 1a9d84371a4d..ee91433127bc 100644\n--- a/arch/powerpc/platforms/powernv/rng.c\n+++ b/arch/powerpc/platforms/powernv/rng.c\n@@ -88,7 +88,7 @@ static __init void rng_init_per_cpu(struct powernv_rng *rng,\n\n \tchip_id = of_get_ibm_chip_id(dn);\n \tif (chip_id == -1)\n-\t\tpr_warn(\"No ibm,chip-id found for %s.\\n\", dn->full_name);\n+\t\tpr_warn(\"No ibm,chip-id found for %pOF.\\n\", dn);\n\n \tfor_each_possible_cpu(cpu) {\n \t\tif (per_cpu(powernv_rng, cpu) == NULL ||\n@@ -141,8 +141,8 @@ static __init int rng_init(void)\n \tfor_each_compatible_node(dn, NULL, \"ibm,power-rng\") {\n \t\trc = rng_create(dn);\n \t\tif (rc) {\n-\t\t\tpr_err(\"Failed creating rng for %s (%d).\\n\",\n-\t\t\t\tdn->full_name, rc);\n+\t\t\tpr_err(\"Failed creating rng for %pOF (%d).\\n\",\n+\t\t\t\tdn, rc);\n \t\t\tcontinue;\n \t\t}\n\ndiff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c\nindex 39187696ee74..80b84c9c8509 100644\n--- a/arch/powerpc/platforms/pseries/dlpar.c\n+++ b/arch/powerpc/platforms/pseries/dlpar.c\n@@ -264,8 +264,7 @@ int dlpar_attach_node(struct device_node *dn)\n\n \trc = of_attach_node(dn);\n \tif (rc) {\n-\t\tprintk(KERN_ERR \"Failed to add device node %s\\n\",\n-\t\t       dn->full_name);\n+\t\tprintk(KERN_ERR \"Failed to add device node %pOF\\n\", dn);\n \t\treturn rc;\n \t}\n\ndiff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c\nindex 32187dc76730..6eeb0d4bab61 100644\n--- a/arch/powerpc/platforms/pseries/event_sources.c\n+++ b/arch/powerpc/platforms/pseries/event_sources.c\n@@ -36,8 +36,8 @@ void request_event_sources_irqs(struct device_node *np,\n \t\tvirqs[count] = irq_create_of_mapping(&oirq);\n \t\tif (!virqs[count]) {\n \t\t\tpr_err(\"event-sources: Unable to allocate \"\n-\t\t\t       \"interrupt number for %s\\n\",\n-\t\t\t       np->full_name);\n+\t\t\t       \"interrupt number for %pOF\\n\",\n+\t\t\t       np);\n \t\t\tWARN_ON(1);\n \t\t} else {\n \t\t\tcount++;\n@@ -48,7 +48,7 @@ void request_event_sources_irqs(struct device_node *np,\n \tfor (i = 0; i < count; i++) {\n \t\tif (request_irq(virqs[i], handler, 0, name, NULL)) {\n \t\t\tpr_err(\"event-sources: Unable to request interrupt \"\n-\t\t\t       \"%d for %s\\n\", virqs[i], np->full_name);\n+\t\t\t       \"%d for %pOF\\n\", virqs[i], np);\n \t\t\tWARN_ON(1);\n \t\t\treturn;\n \t\t}\ndiff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c\nindex 6afd1efd3633..0a93093fbcef 100644\n--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c\n+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c\n@@ -264,8 +264,8 @@ static int pseries_add_processor(struct device_node *np)\n \t\t/* If we get here, it most likely means that NR_CPUS is\n \t\t * less than the partition's max processors setting.\n \t\t */\n-\t\tprintk(KERN_ERR \"Cannot add cpu %s; this system configuration\"\n-\t\t       \" supports %d logical cpus.\\n\", np->full_name,\n+\t\tprintk(KERN_ERR \"Cannot add cpu %pOF; this system configuration\"\n+\t\t       \" supports %d logical cpus.\\n\", np,\n \t\t       num_possible_cpus());\n \t\tgoto out_unlock;\n \t}\ndiff --git a/arch/powerpc/platforms/pseries/ibmebus.c b/arch/powerpc/platforms/pseries/ibmebus.c\nindex 52146b1356d2..408a86044133 100644\n--- a/arch/powerpc/platforms/pseries/ibmebus.c\n+++ b/arch/powerpc/platforms/pseries/ibmebus.c\n@@ -150,8 +150,7 @@ static const struct dma_map_ops ibmebus_dma_ops = {\n static int ibmebus_match_path(struct device *dev, void *data)\n {\n \tstruct device_node *dn = to_platform_device(dev)->dev.of_node;\n-\treturn (dn->full_name &&\n-\t\t(strcasecmp((char *)data, dn->full_name) == 0));\n+\treturn (of_find_node_by_path(data) == dn);\n }\n\n static int ibmebus_match_node(struct device *dev, void *data)\n@@ -395,7 +394,7 @@ static ssize_t devspec_show(struct device *dev,\n \tstruct platform_device *ofdev;\n\n \tofdev = to_platform_device(dev);\n-\treturn sprintf(buf, \"%s\\n\", ofdev->dev.of_node->full_name);\n+\treturn sprintf(buf, \"%pOF\\n\", ofdev->dev.of_node);\n }\n static DEVICE_ATTR_RO(devspec);\n\ndiff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c\nindex 8374adee27e3..7c181467d0ad 100644\n--- a/arch/powerpc/platforms/pseries/iommu.c\n+++ b/arch/powerpc/platforms/pseries/iommu.c\n@@ -511,8 +511,8 @@ static void iommu_table_setparms(struct pci_controller *phb,\n \tbasep = of_get_property(node, \"linux,tce-base\", NULL);\n \tsizep = of_get_property(node, \"linux,tce-size\", NULL);\n \tif (basep == NULL || sizep == NULL) {\n-\t\tprintk(KERN_ERR \"PCI_DMA: iommu_table_setparms: %s has \"\n-\t\t\t\t\"missing tce entries !\\n\", dn->full_name);\n+\t\tprintk(KERN_ERR \"PCI_DMA: iommu_table_setparms: %pOF has \"\n+\t\t\t\t\"missing tce entries !\\n\", dn);\n \t\treturn;\n \t}\n\n@@ -587,7 +587,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)\n\n \tdn = pci_bus_to_OF_node(bus);\n\n-\tpr_debug(\"pci_dma_bus_setup_pSeries: setting up bus %s\\n\", dn->full_name);\n+\tpr_debug(\"pci_dma_bus_setup_pSeries: setting up bus %pOF\\n\", dn);\n\n \tif (bus->self) {\n \t\t/* This is not a root bus, any setup will be done for the\n@@ -701,8 +701,8 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)\n\n \tdn = pci_bus_to_OF_node(bus);\n\n-\tpr_debug(\"pci_dma_bus_setup_pSeriesLP: setting up bus %s\\n\",\n-\t\t dn->full_name);\n+\tpr_debug(\"pci_dma_bus_setup_pSeriesLP: setting up bus %pOF\\n\",\n+\t\t dn);\n\n \t/* Find nearest ibm,dma-window, walking up the device tree */\n \tfor (pdn = dn; pdn != NULL; pdn = pdn->parent) {\n@@ -718,8 +718,8 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)\n\n \tppci = PCI_DN(pdn);\n\n-\tpr_debug(\"  parent is %s, iommu_table: 0x%p\\n\",\n-\t\t pdn->full_name, ppci->table_group);\n+\tpr_debug(\"  parent is %pOF, iommu_table: 0x%p\\n\",\n+\t\t pdn, ppci->table_group);\n\n \tif (!ppci->table_group) {\n \t\tppci->table_group = iommu_pseries_alloc_group(ppci->phb->node);\n@@ -817,28 +817,28 @@ static void remove_ddw(struct device_node *np, bool remove_prop)\n \tret = tce_clearrange_multi_pSeriesLP(0,\n \t\t1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp);\n \tif (ret)\n-\t\tpr_warning(\"%s failed to clear tces in window.\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_warning(\"%pOF failed to clear tces in window.\\n\",\n+\t\t\t np);\n \telse\n-\t\tpr_debug(\"%s successfully cleared tces in window.\\n\",\n-\t\t\t np->full_name);\n+\t\tpr_debug(\"%pOF successfully cleared tces in window.\\n\",\n+\t\t\t np);\n\n \tret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);\n \tif (ret)\n-\t\tpr_warning(\"%s: failed to remove direct window: rtas returned \"\n+\t\tpr_warning(\"%pOF: failed to remove direct window: rtas returned \"\n \t\t\t\"%d to ibm,remove-pe-dma-window(%x) %llx\\n\",\n-\t\t\tnp->full_name, ret, ddw_avail[2], liobn);\n+\t\t\tnp, ret, ddw_avail[2], liobn);\n \telse\n-\t\tpr_debug(\"%s: successfully removed direct window: rtas returned \"\n+\t\tpr_debug(\"%pOF: successfully removed direct window: rtas returned \"\n \t\t\t\"%d to ibm,remove-pe-dma-window(%x) %llx\\n\",\n-\t\t\tnp->full_name, ret, ddw_avail[2], liobn);\n+\t\t\tnp, ret, ddw_avail[2], liobn);\n\n delprop:\n \tif (remove_prop)\n \t\tret = of_remove_property(np, win64);\n \tif (ret)\n-\t\tpr_warning(\"%s: failed to remove direct window property: %d\\n\",\n-\t\t\tnp->full_name, ret);\n+\t\tpr_warning(\"%pOF: failed to remove direct window property: %d\\n\",\n+\t\t\tnp, ret);\n }\n\n static u64 find_existing_ddw(struct device_node *pdn)\n@@ -1004,7 +1004,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)\n \t * list.\n \t */\n \tlist_for_each_entry(fpdn, &failed_ddw_pdn_list, list) {\n-\t\tif (!strcmp(fpdn->pdn->full_name, pdn->full_name))\n+\t\tif (fpdn->pdn == pdn)\n \t\t\tgoto out_unlock;\n \t}\n\n@@ -1087,8 +1087,8 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)\n \tddwprop->tce_shift = cpu_to_be32(page_shift);\n \tddwprop->window_shift = cpu_to_be32(len);\n\n-\tdev_dbg(&dev->dev, \"created tce table LIOBN 0x%x for %s\\n\",\n-\t\t  create.liobn, dn->full_name);\n+\tdev_dbg(&dev->dev, \"created tce table LIOBN 0x%x for %pOF\\n\",\n+\t\t  create.liobn, dn);\n\n \twindow = kzalloc(sizeof(*window), GFP_KERNEL);\n \tif (!window)\n@@ -1097,15 +1097,15 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)\n \tret = walk_system_ram_range(0, memblock_end_of_DRAM() >> PAGE_SHIFT,\n \t\t\twin64->value, tce_setrange_multi_pSeriesLP_walk);\n \tif (ret) {\n-\t\tdev_info(&dev->dev, \"failed to map direct window for %s: %d\\n\",\n-\t\t\t dn->full_name, ret);\n+\t\tdev_info(&dev->dev, \"failed to map direct window for %pOF: %d\\n\",\n+\t\t\t dn, ret);\n \t\tgoto out_free_window;\n \t}\n\n \tret = of_add_property(pdn, win64);\n \tif (ret) {\n-\t\tdev_err(&dev->dev, \"unable to add dma window property for %s: %d\",\n-\t\t\t pdn->full_name, ret);\n+\t\tdev_err(&dev->dev, \"unable to add dma window property for %pOF: %d\",\n+\t\t\t pdn, ret);\n \t\tgoto out_free_window;\n \t}\n\n@@ -1158,7 +1158,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)\n \t * already allocated.\n \t */\n \tdn = pci_device_to_OF_node(dev);\n-\tpr_debug(\"  node is %s\\n\", dn->full_name);\n+\tpr_debug(\"  node is %pOF\\n\", dn);\n\n \tfor (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->table_group;\n \t     pdn = pdn->parent) {\n@@ -1169,11 +1169,11 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)\n\n \tif (!pdn || !PCI_DN(pdn)) {\n \t\tprintk(KERN_WARNING \"pci_dma_dev_setup_pSeriesLP: \"\n-\t\t       \"no DMA window found for pci dev=%s dn=%s\\n\",\n-\t\t\t\t pci_name(dev), of_node_full_name(dn));\n+\t\t       \"no DMA window found for pci dev=%s dn=%pOF\\n\",\n+\t\t\t\t pci_name(dev), dn);\n \t\treturn;\n \t}\n-\tpr_debug(\"  parent is %s\\n\", pdn->full_name);\n+\tpr_debug(\"  parent is %pOF\\n\", pdn);\n\n \tpci = PCI_DN(pdn);\n \tif (!pci->table_group) {\n@@ -1213,7 +1213,7 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)\n \t/* only attempt to use a new window if 64-bit DMA is requested */\n \tif (!disable_ddw && dma_mask == DMA_BIT_MASK(64)) {\n \t\tdn = pci_device_to_OF_node(pdev);\n-\t\tdev_dbg(dev, \"node is %s\\n\", dn->full_name);\n+\t\tdev_dbg(dev, \"node is %pOF\\n\", dn);\n\n \t\t/*\n \t\t * the device tree might contain the dma-window properties\ndiff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c\nindex 326ef0dd6038..353912e700eb 100644\n--- a/arch/powerpc/platforms/pseries/msi.c\n+++ b/arch/powerpc/platforms/pseries/msi.c\n@@ -144,7 +144,7 @@ static int check_req(struct pci_dev *pdev, int nvec, char *prop_name)\n\n \tp = of_get_property(dn, prop_name, NULL);\n \tif (!p) {\n-\t\tpr_debug(\"rtas_msi: No %s on %s\\n\", prop_name, dn->full_name);\n+\t\tpr_debug(\"rtas_msi: No %s on %pOF\\n\", prop_name, dn);\n \t\treturn -ENOENT;\n \t}\n\n@@ -182,8 +182,8 @@ static struct device_node *find_pe_total_msi(struct pci_dev *dev, int *total)\n \twhile (dn) {\n \t\tp = of_get_property(dn, \"ibm,pe-total-#msi\", NULL);\n \t\tif (p) {\n-\t\t\tpr_debug(\"rtas_msi: found prop on dn %s\\n\",\n-\t\t\t\tdn->full_name);\n+\t\t\tpr_debug(\"rtas_msi: found prop on dn %pOF\\n\",\n+\t\t\t\tdn);\n \t\t\t*total = be32_to_cpup(p);\n \t\t\treturn dn;\n \t\t}\n@@ -222,7 +222,7 @@ static struct device_node *find_pe_dn(struct pci_dev *dev, int *total)\n\n \t/* Hardcode of 8 for old firmwares */\n \t*total = 8;\n-\tpr_debug(\"rtas_msi: using PE dn %s\\n\", dn->full_name);\n+\tpr_debug(\"rtas_msi: using PE dn %pOF\\n\", dn);\n\n \treturn dn;\n }\n@@ -242,7 +242,7 @@ static void *count_non_bridge_devices(struct device_node *dn, void *data)\n \tconst __be32 *p;\n \tu32 class;\n\n-\tpr_debug(\"rtas_msi: counting %s\\n\", dn->full_name);\n+\tpr_debug(\"rtas_msi: counting %pOF\\n\", dn);\n\n \tp = of_get_property(dn, \"class-code\", NULL);\n \tclass = p ? be32_to_cpup(p) : 0;\n@@ -300,7 +300,7 @@ static int msi_quota_for_device(struct pci_dev *dev, int request)\n \t\tgoto out;\n \t}\n\n-\tpr_debug(\"rtas_msi: found PE %s\\n\", pe_dn->full_name);\n+\tpr_debug(\"rtas_msi: found PE %pOF\\n\", pe_dn);\n\n \tmemset(&counts, 0, sizeof(struct msi_counts));\n\ndiff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c\nindex 547fd13e4f8e..561917fa54a8 100644\n--- a/arch/powerpc/platforms/pseries/pci_dlpar.c\n+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c\n@@ -38,7 +38,7 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn)\n {\n \tstruct pci_controller *phb;\n\n-\tpr_debug(\"PCI: Initializing new hotplug PHB %s\\n\", dn->full_name);\n+\tpr_debug(\"PCI: Initializing new hotplug PHB %pOF\\n\", dn);\n\n \tphb = pcibios_alloc_controller(dn);\n \tif (!phb)\ndiff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c\nindex 8a47f168476b..3201feb6d32b 100644\n--- a/arch/powerpc/platforms/pseries/vio.c\n+++ b/arch/powerpc/platforms/pseries/vio.c\n@@ -1357,14 +1357,14 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)\n \t */\n \tparent_node = of_get_parent(of_node);\n \tif (parent_node) {\n-\t\tif (!strcmp(parent_node->full_name, \"/ibm,platform-facilities\"))\n+\t\tif (!strcmp(parent_node->full_name, \"ibm,platform-facilities\"))\n \t\t\tfamily = PFO;\n-\t\telse if (!strcmp(parent_node->full_name, \"/vdevice\"))\n+\t\telse if (!strcmp(parent_node->full_name, \"vdevice\"))\n \t\t\tfamily = VDEVICE;\n \t\telse {\n-\t\t\tpr_warn(\"%s: parent(%s) of %s not recognized.\\n\",\n+\t\t\tpr_warn(\"%s: parent(%pOF) of %s not recognized.\\n\",\n \t\t\t\t\t__func__,\n-\t\t\t\t\tparent_node->full_name,\n+\t\t\t\t\tparent_node,\n \t\t\t\t\tof_node_name);\n \t\t\tof_node_put(parent_node);\n \t\t\treturn NULL;\n@@ -1555,7 +1555,7 @@ static ssize_t devspec_show(struct device *dev,\n {\n \tstruct device_node *of_node = dev->of_node;\n\n-\treturn sprintf(buf, \"%s\\n\", of_node_full_name(of_node));\n+\treturn sprintf(buf, \"%pOF\\n\", of_node);\n }\n static DEVICE_ATTR_RO(devspec);\n\n@@ -1685,7 +1685,7 @@ struct vio_dev *vio_find_node(struct device_node *vnode)\n \t/* construct the kobject name from the device node */\n \tif (!strcmp(dev_type, \"vdevice\")) {\n \t\tconst __be32 *prop;\n-\n+\n \t\tprop = of_get_property(vnode, \"reg\", NULL);\n \t\tif (!prop)\n \t\t\treturn NULL;\ndiff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c\nindex 2799706106c6..072296eba3e7 100644\n--- a/arch/powerpc/sysdev/axonram.c\n+++ b/arch/powerpc/sysdev/axonram.c\n@@ -188,8 +188,8 @@ static int axon_ram_probe(struct platform_device *device)\n\n \taxon_ram_bank_id++;\n\n-\tdev_info(&device->dev, \"Found memory controller on %s\\n\",\n-\t\t\tdevice->dev.of_node->full_name);\n+\tdev_info(&device->dev, \"Found memory controller on %pOF\\n\",\n+\t\t\tdevice->dev.of_node);\n\n \tbank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);\n \tif (bank == NULL) {\ndiff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c\nindex 121e26fffd50..d72eda568b7d 100644\n--- a/arch/powerpc/sysdev/dcr.c\n+++ b/arch/powerpc/sysdev/dcr.c\n@@ -195,8 +195,8 @@ dcr_host_mmio_t dcr_map_mmio(struct device_node *dev,\n \tdcr_host_mmio_t ret = { .token = NULL, .stride = 0, .base = dcr_n };\n \tu64 addr;\n\n-\tpr_debug(\"dcr_map(%s, 0x%x, 0x%x)\\n\",\n-\t\t dev->full_name, dcr_n, dcr_c);\n+\tpr_debug(\"dcr_map(%pOF, 0x%x, 0x%x)\\n\",\n+\t\t dev, dcr_n, dcr_c);\n\n \taddr = of_translate_dcr_address(dev, dcr_n, &ret.stride);\n \tpr_debug(\"translates to addr: 0x%llx, stride: 0x%x\\n\",\ndiff --git a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c\nindex 37a69097e022..00ccf3e4fcb4 100644\n--- a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c\n+++ b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c\n@@ -101,8 +101,8 @@ int __init instantiate_cache_sram(struct platform_device *dev,\n\n \tif (!request_mem_region(cache_sram->base_phys, cache_sram->size,\n \t\t\t\t\t\t\"fsl_85xx_cache_sram\")) {\n-\t\tdev_err(&dev->dev, \"%s: request memory failed\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\tdev_err(&dev->dev, \"%pOF: request memory failed\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\tret = -ENXIO;\n \t\tgoto out_free;\n \t}\n@@ -110,16 +110,16 @@ int __init instantiate_cache_sram(struct platform_device *dev,\n \tcache_sram->base_virt = ioremap_prot(cache_sram->base_phys,\n \t\t\t\tcache_sram->size, _PAGE_COHERENT | PAGE_KERNEL);\n \tif (!cache_sram->base_virt) {\n-\t\tdev_err(&dev->dev, \"%s: ioremap_prot failed\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\tdev_err(&dev->dev, \"%pOF: ioremap_prot failed\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\tret = -ENOMEM;\n \t\tgoto out_release;\n \t}\n\n \tcache_sram->rh = rh_create(sizeof(unsigned int));\n \tif (IS_ERR(cache_sram->rh)) {\n-\t\tdev_err(&dev->dev, \"%s: Unable to create remote heap\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\tdev_err(&dev->dev, \"%pOF: Unable to create remote heap\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\tret = PTR_ERR(cache_sram->rh);\n \t\tgoto out_unmap;\n \t}\ndiff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c\nindex a6f0b96ce2c9..d902306f4718 100644\n--- a/arch/powerpc/sysdev/fsl_gtm.c\n+++ b/arch/powerpc/sysdev/fsl_gtm.c\n@@ -388,8 +388,8 @@ static int __init fsl_gtm_init(void)\n\n \t\tgtm = kzalloc(sizeof(*gtm), GFP_KERNEL);\n \t\tif (!gtm) {\n-\t\t\tpr_err(\"%s: unable to allocate memory\\n\",\n-\t\t\t\tnp->full_name);\n+\t\t\tpr_err(\"%pOF: unable to allocate memory\\n\",\n+\t\t\t\tnp);\n \t\t\tcontinue;\n \t\t}\n\n@@ -397,7 +397,7 @@ static int __init fsl_gtm_init(void)\n\n \t\tclock = of_get_property(np, \"clock-frequency\", &size);\n \t\tif (!clock || size != sizeof(*clock)) {\n-\t\t\tpr_err(\"%s: no clock-frequency\\n\", np->full_name);\n+\t\t\tpr_err(\"%pOF: no clock-frequency\\n\", np);\n \t\t\tgoto err;\n \t\t}\n \t\tgtm->clock = *clock;\n@@ -407,8 +407,8 @@ static int __init fsl_gtm_init(void)\n\n \t\t\tirq = irq_of_parse_and_map(np, i);\n \t\t\tif (!irq) {\n-\t\t\t\tpr_err(\"%s: not enough interrupts specified\\n\",\n-\t\t\t\t       np->full_name);\n+\t\t\t\tpr_err(\"%pOF: not enough interrupts specified\\n\",\n+\t\t\t\t       np);\n \t\t\t\tgoto err;\n \t\t\t}\n \t\t\tgtm->timers[i].irq = irq;\n@@ -417,8 +417,8 @@ static int __init fsl_gtm_init(void)\n\n \t\tgtm->regs = of_iomap(np, 0);\n \t\tif (!gtm->regs) {\n-\t\t\tpr_err(\"%s: unable to iomap registers\\n\",\n-\t\t\t       np->full_name);\n+\t\t\tpr_err(\"%pOF: unable to iomap registers\\n\",\n+\t\t\t       np);\n \t\t\tgoto err;\n \t\t}\n\ndiff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c\nindex 8a244828782e..44cbf4c12ea1 100644\n--- a/arch/powerpc/sysdev/fsl_msi.c\n+++ b/arch/powerpc/sysdev/fsl_msi.c\n@@ -214,8 +214,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)\n \t\t\tphandle = np->phandle;\n \t\telse {\n \t\t\tdev_err(&pdev->dev,\n-\t\t\t\t\"node %s has an invalid fsl,msi phandle %u\\n\",\n-\t\t\t\those->dn->full_name, np->phandle);\n+\t\t\t\t\"node %pOF has an invalid fsl,msi phandle %u\\n\",\n+\t\t\t\those->dn, np->phandle);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -438,16 +438,16 @@ static int fsl_of_msi_probe(struct platform_device *dev)\n \tif ((features->fsl_pic_ip & FSL_PIC_IP_MASK) != FSL_PIC_IP_VMPIC) {\n \t\terr = of_address_to_resource(dev->dev.of_node, 0, &res);\n \t\tif (err) {\n-\t\t\tdev_err(&dev->dev, \"invalid resource for node %s\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\t\tdev_err(&dev->dev, \"invalid resource for node %pOF\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\t\tgoto error_out;\n \t\t}\n\n \t\tmsi->msi_regs = ioremap(res.start, resource_size(&res));\n \t\tif (!msi->msi_regs) {\n \t\t\terr = -ENOMEM;\n-\t\t\tdev_err(&dev->dev, \"could not map node %s\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\t\tdev_err(&dev->dev, \"could not map node %pOF\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\t\tgoto error_out;\n \t\t}\n \t\tmsi->msiir_offset =\n@@ -522,8 +522,8 @@ static int fsl_of_msi_probe(struct platform_device *dev)\n \t\tfor (irq_index = 0, i = 0; i < len / (2 * sizeof(u32)); i++) {\n \t\t\tif (p[i * 2] % IRQS_PER_MSI_REG ||\n \t\t\t    p[i * 2 + 1] % IRQS_PER_MSI_REG) {\n-\t\t\t\tpr_warn(\"%s: %s: msi available range of %u at %u is not IRQ-aligned\\n\",\n-\t\t\t\t       __func__, dev->dev.of_node->full_name,\n+\t\t\t\tpr_warn(\"%s: %pOF: msi available range of %u at %u is not IRQ-aligned\\n\",\n+\t\t\t\t       __func__, dev->dev.of_node,\n \t\t\t\t       p[i * 2 + 1], p[i * 2]);\n \t\t\t\terr = -EINVAL;\n \t\t\t\tgoto error_out;\ndiff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c\nindex d3a597456b6e..22d98057f773 100644\n--- a/arch/powerpc/sysdev/fsl_pci.c\n+++ b/arch/powerpc/sysdev/fsl_pci.c\n@@ -202,7 +202,6 @@ static void setup_pci_atmu(struct pci_controller *hose)\n \tu32 pcicsrbar = 0, pcicsrbar_sz;\n \tu32 piwar = PIWAR_EN | PIWAR_PF | PIWAR_TGI_LOCAL |\n \t\t\tPIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;\n-\tconst char *name = hose->dn->full_name;\n \tconst u64 *reg;\n \tint len;\n \tbool setup_inbound;\n@@ -290,12 +289,12 @@ static void setup_pci_atmu(struct pci_controller *hose)\n \tpaddr_lo -= offset;\n\n \tif (paddr_hi == paddr_lo) {\n-\t\tpr_err(\"%s: No outbound window space\\n\", name);\n+\t\tpr_err(\"%pOF: No outbound window space\\n\", hose->dn);\n \t\treturn;\n \t}\n\n \tif (paddr_lo == 0) {\n-\t\tpr_err(\"%s: No space for inbound window\\n\", name);\n+\t\tpr_err(\"%pOF: No space for inbound window\\n\", hose->dn);\n \t\treturn;\n \t}\n\n@@ -313,7 +312,7 @@ static void setup_pci_atmu(struct pci_controller *hose)\n\n \tpaddr_lo = min(paddr_lo, (u64)pcicsrbar);\n\n-\tpr_info(\"%s: PCICSRBAR @ 0x%x\\n\", name, pcicsrbar);\n+\tpr_info(\"%pOF: PCICSRBAR @ 0x%x\\n\", hose->dn, pcicsrbar);\n\n \t/* Setup inbound mem window */\n \tmem = memblock_end_of_DRAM();\n@@ -336,12 +335,12 @@ static void setup_pci_atmu(struct pci_controller *hose)\n \t\tu64 address = be64_to_cpup(reg);\n\n \t\tif ((address >= mem) && (address < (mem + PAGE_SIZE))) {\n-\t\t\tpr_info(\"%s: extending DDR ATMU to cover MSIIR\", name);\n+\t\t\tpr_info(\"%pOF: extending DDR ATMU to cover MSIIR\", hose->dn);\n \t\t\tmem += PAGE_SIZE;\n \t\t} else {\n \t\t\t/* TODO: Create a new ATMU for MSIIR */\n-\t\t\tpr_warn(\"%s: msi-address-64 address of %llx is \"\n-\t\t\t\t\"unsupported\\n\", name, address);\n+\t\t\tpr_warn(\"%pOF: msi-address-64 address of %llx is \"\n+\t\t\t\t\"unsupported\\n\", hose->dn, address);\n \t\t}\n \t}\n\n@@ -354,8 +353,8 @@ static void setup_pci_atmu(struct pci_controller *hose)\n \t\tif ((1ull << mem_log) != mem) {\n \t\t\tmem_log++;\n \t\t\tif ((1ull << mem_log) > mem)\n-\t\t\t\tpr_info(\"%s: Setting PCI inbound window \"\n-\t\t\t\t\t\"greater than memory size\\n\", name);\n+\t\t\t\tpr_info(\"%pOF: Setting PCI inbound window \"\n+\t\t\t\t\t\"greater than memory size\\n\", hose->dn);\n \t\t}\n\n \t\tpiwar |= ((mem_log - 1) & PIWAR_SZ_MASK);\n@@ -402,7 +401,7 @@ static void setup_pci_atmu(struct pci_controller *hose)\n \t\t\t */\n \t\t\tppc_md.dma_set_mask = fsl_pci_dma_set_mask;\n\n-\t\t\tpr_info(\"%s: Setup 64-bit PCI DMA window\\n\", name);\n+\t\t\tpr_info(\"%pOF: Setup 64-bit PCI DMA window\\n\", hose->dn);\n \t\t}\n \t} else {\n \t\tu64 paddr = 0;\n@@ -443,18 +442,18 @@ static void setup_pci_atmu(struct pci_controller *hose)\n #ifdef CONFIG_SWIOTLB\n \t\tppc_swiotlb_enable = 1;\n #else\n-\t\tpr_err(\"%s: ERROR: Memory size exceeds PCI ATMU ability to \"\n+\t\tpr_err(\"%pOF: ERROR: Memory size exceeds PCI ATMU ability to \"\n \t\t\t\"map - enable CONFIG_SWIOTLB to avoid dma errors.\\n\",\n-\t\t\t name);\n+\t\t\t hose->dn);\n #endif\n \t\t/* adjusting outbound windows could reclaim space in mem map */\n \t\tif (paddr_hi < 0xffffffffull)\n-\t\t\tpr_warning(\"%s: WARNING: Outbound window cfg leaves \"\n+\t\t\tpr_warning(\"%pOF: WARNING: Outbound window cfg leaves \"\n \t\t\t\t\"gaps in memory map. Adjusting the memory map \"\n \t\t\t\t\"could reduce unnecessary bounce buffering.\\n\",\n-\t\t\t\tname);\n+\t\t\t\those->dn);\n\n-\t\tpr_info(\"%s: DMA window size is 0x%llx\\n\", name,\n+\t\tpr_info(\"%pOF: DMA window size is 0x%llx\\n\", hose->dn,\n \t\t\t(u64)hose->dma_window_size);\n \t}\n }\n@@ -532,11 +531,11 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)\n \tdev = pdev->dev.of_node;\n\n \tif (!of_device_is_available(dev)) {\n-\t\tpr_warning(\"%s: disabled\\n\", dev->full_name);\n+\t\tpr_warning(\"%pOF: disabled\\n\", dev);\n \t\treturn -ENODEV;\n \t}\n\n-\tpr_debug(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tpr_debug(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \t/* Fetch host bridge registers address */\n \tif (of_address_to_resource(dev, 0, &rsrc)) {\n@@ -547,8 +546,8 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)\n \t/* Get bus range if any */\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int))\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t\t\" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t\t\" bus 0\\n\", dev);\n\n \tpci_add_flags(PCI_REASSIGN_ALL_BUS);\n \those = pcibios_alloc_controller(dev);\n@@ -809,11 +808,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)\n \tis_mpc83xx_pci = 1;\n\n \tif (!of_device_is_available(dev)) {\n-\t\tpr_warning(\"%s: disabled by the firmware.\\n\",\n-\t\t\t   dev->full_name);\n+\t\tpr_warning(\"%pOF: disabled by the firmware.\\n\",\n+\t\t\t   dev);\n \t\treturn -ENODEV;\n \t}\n-\tpr_debug(\"Adding PCI host bridge %s\\n\", dev->full_name);\n+\tpr_debug(\"Adding PCI host bridge %pOF\\n\", dev);\n\n \t/* Fetch host bridge registers address */\n \tif (of_address_to_resource(dev, 0, &rsrc_reg)) {\n@@ -848,8 +847,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev)\n \t/* Get bus range if any */\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t       \" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t       \" bus 0\\n\", dev);\n \t}\n\n \tpci_add_flags(PCI_REASSIGN_ALL_BUS);\ndiff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c\nindex 1c41c51f22cb..9234be1e66f5 100644\n--- a/arch/powerpc/sysdev/fsl_rio.c\n+++ b/arch/powerpc/sysdev/fsl_rio.c\n@@ -450,12 +450,12 @@ int fsl_rio_setup(struct platform_device *dev)\n\n \trc = of_address_to_resource(dev->dev.of_node, 0, &regs);\n \tif (rc) {\n-\t\tdev_err(&dev->dev, \"Can't get %s property 'reg'\\n\",\n-\t\t\t\tdev->dev.of_node->full_name);\n+\t\tdev_err(&dev->dev, \"Can't get %pOF property 'reg'\\n\",\n+\t\t\t\tdev->dev.of_node);\n \t\treturn -EFAULT;\n \t}\n-\tdev_info(&dev->dev, \"Of-device full name %s\\n\",\n-\t\t\tdev->dev.of_node->full_name);\n+\tdev_info(&dev->dev, \"Of-device full name %pOF\\n\",\n+\t\t\tdev->dev.of_node);\n \tdev_info(&dev->dev, \"Regs: %pR\\n\", &regs);\n\n \trio_regs_win = ioremap(regs.start, resource_size(&regs));\n@@ -494,8 +494,8 @@ int fsl_rio_setup(struct platform_device *dev)\n \t}\n \trc = of_address_to_resource(rmu_node, 0, &rmu_regs);\n \tif (rc) {\n-\t\tdev_err(&dev->dev, \"Can't get %s property 'reg'\\n\",\n-\t\t\t\trmu_node->full_name);\n+\t\tdev_err(&dev->dev, \"Can't get %pOF property 'reg'\\n\",\n+\t\t\t\trmu_node);\n \t\tgoto err_rmu;\n \t}\n \trmu_regs_win = ioremap(rmu_regs.start, resource_size(&rmu_regs));\n@@ -529,8 +529,8 @@ int fsl_rio_setup(struct platform_device *dev)\n \taw = of_n_addr_cells(np);\n \tdt_range = of_get_property(np, \"reg\", &rlen);\n \tif (!dt_range) {\n-\t\tpr_err(\"%s: unable to find 'reg' property\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_err(\"%pOF: unable to find 'reg' property\\n\",\n+\t\t\tnp);\n \t\trc = -ENOMEM;\n \t\tgoto err_pw;\n \t}\n@@ -557,8 +557,8 @@ int fsl_rio_setup(struct platform_device *dev)\n \taw = of_n_addr_cells(np);\n \tdt_range = of_get_property(np, \"reg\", &rlen);\n \tif (!dt_range) {\n-\t\tpr_err(\"%s: unable to find 'reg' property\\n\",\n-\t\t\tnp->full_name);\n+\t\tpr_err(\"%pOF: unable to find 'reg' property\\n\",\n+\t\t\tnp);\n \t\trc = -ENOMEM;\n \t\tgoto err;\n \t}\n@@ -569,15 +569,15 @@ int fsl_rio_setup(struct platform_device *dev)\n \tfor_each_child_of_node(dev->dev.of_node, np) {\n \t\tport_index = of_get_property(np, \"cell-index\", NULL);\n \t\tif (!port_index) {\n-\t\t\tdev_err(&dev->dev, \"Can't get %s property 'cell-index'\\n\",\n-\t\t\t\t\tnp->full_name);\n+\t\t\tdev_err(&dev->dev, \"Can't get %pOF property 'cell-index'\\n\",\n+\t\t\t\t\tnp);\n \t\t\tcontinue;\n \t\t}\n\n \t\tdt_range = of_get_property(np, \"ranges\", &rlen);\n \t\tif (!dt_range) {\n-\t\t\tdev_err(&dev->dev, \"Can't get %s property 'ranges'\\n\",\n-\t\t\t\t\tnp->full_name);\n+\t\t\tdev_err(&dev->dev, \"Can't get %pOF property 'ranges'\\n\",\n+\t\t\t\t\tnp);\n \t\t\tcontinue;\n \t\t}\n\n@@ -598,8 +598,8 @@ int fsl_rio_setup(struct platform_device *dev)\n \t\trange_start = of_read_number(dt_range + aw, paw);\n \t\trange_size = of_read_number(dt_range + aw + paw, sw);\n\n-\t\tdev_info(&dev->dev, \"%s: LAW start 0x%016llx, size 0x%016llx.\\n\",\n-\t\t\t\tnp->full_name, range_start, range_size);\n+\t\tdev_info(&dev->dev, \"%pOF: LAW start 0x%016llx, size 0x%016llx.\\n\",\n+\t\t\t\tnp, range_start, range_size);\n\n \t\tport = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);\n \t\tif (!port)\n@@ -757,8 +757,8 @@ int fsl_rio_setup(struct platform_device *dev)\n  */\n static int fsl_of_rio_rpn_probe(struct platform_device *dev)\n {\n-\tprintk(KERN_INFO \"Setting up RapidIO peer-to-peer network %s\\n\",\n-\t\t\tdev->dev.of_node->full_name);\n+\tprintk(KERN_INFO \"Setting up RapidIO peer-to-peer network %pOF\\n\",\n+\t\t\tdev->dev.of_node);\n\n \treturn fsl_rio_setup(dev);\n };\ndiff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c\nindex c1826de4e749..ab7a74c75be8 100644\n--- a/arch/powerpc/sysdev/fsl_rmu.c\n+++ b/arch/powerpc/sysdev/fsl_rmu.c\n@@ -1074,8 +1074,8 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)\n \tpriv = mport->priv;\n\n \tif (!node) {\n-\t\tdev_warn(priv->dev, \"Can't get %s property 'fsl,rmu'\\n\",\n-\t\t\tpriv->dev->of_node->full_name);\n+\t\tdev_warn(priv->dev, \"Can't get %pOF property 'fsl,rmu'\\n\",\n+\t\t\tpriv->dev->of_node);\n \t\treturn -EINVAL;\n \t}\n\n@@ -1086,8 +1086,8 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)\n \taw = of_n_addr_cells(node);\n \tmsg_addr = of_get_property(node, \"reg\", &mlen);\n \tif (!msg_addr) {\n-\t\tpr_err(\"%s: unable to find 'reg' property of message-unit\\n\",\n-\t\t\tnode->full_name);\n+\t\tpr_err(\"%pOF: unable to find 'reg' property of message-unit\\n\",\n+\t\t\tnode);\n \t\tkfree(rmu);\n \t\treturn -ENOMEM;\n \t}\n@@ -1098,8 +1098,8 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)\n\n \trmu->txirq = irq_of_parse_and_map(node, 0);\n \trmu->rxirq = irq_of_parse_and_map(node, 1);\n-\tprintk(KERN_INFO \"%s: txirq: %d, rxirq %d\\n\",\n-\t\tnode->full_name, rmu->txirq, rmu->rxirq);\n+\tprintk(KERN_INFO \"%pOF: txirq: %d, rxirq %d\\n\",\n+\t\tnode, rmu->txirq, rmu->rxirq);\n\n \tpriv->rmm_handle = rmu;\n\ndiff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c\nindex b9aac951a90f..ead3e2549ebf 100644\n--- a/arch/powerpc/sysdev/mpic.c\n+++ b/arch/powerpc/sysdev/mpic.c\n@@ -1650,8 +1650,8 @@ void __init mpic_init(struct mpic *mpic)\n \tif (mpic->flags & MPIC_SECONDARY) {\n \t\tint virq = irq_of_parse_and_map(mpic->node, 0);\n \t\tif (virq) {\n-\t\t\tprintk(KERN_INFO \"%s: hooking up to IRQ %d\\n\",\n-\t\t\t\t\tmpic->node->full_name, virq);\n+\t\t\tprintk(KERN_INFO \"%pOF: hooking up to IRQ %d\\n\",\n+\t\t\t\t\tmpic->node, virq);\n \t\t\tirq_set_handler_data(virq, mpic);\n \t\t\tirq_set_chained_handler(virq, &mpic_cascade);\n \t\t}\ndiff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c\nindex db2286be5d9a..eb69a5186243 100644\n--- a/arch/powerpc/sysdev/mpic_msgr.c\n+++ b/arch/powerpc/sysdev/mpic_msgr.c\n@@ -192,7 +192,7 @@ static int mpic_msgr_probe(struct platform_device *dev)\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n-\tdev_info(&dev->dev, \"Of-device full name %s\\n\", np->full_name);\n+\tdev_info(&dev->dev, \"Of-device full name %pOF\\n\", np);\n\n \t/* IO map the message register block. */\n \tof_address_to_resource(np, 0, &rsrc);\ndiff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c\nindex 1d48a5385905..9ed860aee9c3 100644\n--- a/arch/powerpc/sysdev/mpic_msi.c\n+++ b/arch/powerpc/sysdev/mpic_msi.c\n@@ -60,7 +60,7 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)\n\n \tnp = NULL;\n \twhile ((np = of_find_all_nodes(np))) {\n-\t\tpr_debug(\"mpic: mapping hwirqs for %s\\n\", np->full_name);\n+\t\tpr_debug(\"mpic: mapping hwirqs for %pOF\\n\", np);\n\n \t\tindex = 0;\n \t\twhile (of_irq_parse_one(np, index++, &oirq) == 0) {\ndiff --git a/arch/powerpc/sysdev/mpic_timer.c b/arch/powerpc/sysdev/mpic_timer.c\nindex 9d9b06217f8b..a418579591be 100644\n--- a/arch/powerpc/sysdev/mpic_timer.c\n+++ b/arch/powerpc/sysdev/mpic_timer.c\n@@ -466,8 +466,7 @@ static int timer_group_get_irq(struct device_node *np,\n\n \tp = of_get_property(np, \"fsl,available-ranges\", &len);\n \tif (p && len % (2 * sizeof(u32)) != 0) {\n-\t\tpr_err(\"%s: malformed available-ranges property.\\n\",\n-\t\t\t\tnp->full_name);\n+\t\tpr_err(\"%pOF: malformed available-ranges property.\\n\", np);\n \t\treturn -EINVAL;\n \t}\n\n@@ -484,8 +483,7 @@ static int timer_group_get_irq(struct device_node *np,\n \t\tfor (j = 0; j < count; j++) {\n \t\t\tirq = irq_of_parse_and_map(np, irq_index);\n \t\t\tif (!irq) {\n-\t\t\t\tpr_err(\"%s: irq parse and map failed.\\n\",\n-\t\t\t\t\t\tnp->full_name);\n+\t\t\t\tpr_err(\"%pOF: irq parse and map failed.\\n\", np);\n \t\t\t\treturn -EINVAL;\n \t\t\t}\n\n@@ -508,8 +506,7 @@ static void timer_group_init(struct device_node *np)\n\n \tpriv = kzalloc(sizeof(struct timer_group_priv), GFP_KERNEL);\n \tif (!priv) {\n-\t\tpr_err(\"%s: cannot allocate memory for group.\\n\",\n-\t\t\t\tnp->full_name);\n+\t\tpr_err(\"%pOF: cannot allocate memory for group.\\n\", np);\n \t\treturn;\n \t}\n\n@@ -518,29 +515,27 @@ static void timer_group_init(struct device_node *np)\n\n \tpriv->regs = of_iomap(np, i++);\n \tif (!priv->regs) {\n-\t\tpr_err(\"%s: cannot ioremap timer register address.\\n\",\n-\t\t\t\tnp->full_name);\n+\t\tpr_err(\"%pOF: cannot ioremap timer register address.\\n\", np);\n \t\tgoto out;\n \t}\n\n \tif (priv->flags & FSL_GLOBAL_TIMER) {\n \t\tpriv->group_tcr = of_iomap(np, i++);\n \t\tif (!priv->group_tcr) {\n-\t\t\tpr_err(\"%s: cannot ioremap tcr address.\\n\",\n-\t\t\t\t\tnp->full_name);\n+\t\t\tpr_err(\"%pOF: cannot ioremap tcr address.\\n\", np);\n \t\t\tgoto out;\n \t\t}\n \t}\n\n \tret = timer_group_get_freq(np, priv);\n \tif (ret < 0) {\n-\t\tpr_err(\"%s: cannot get timer frequency.\\n\", np->full_name);\n+\t\tpr_err(\"%pOF: cannot get timer frequency.\\n\", np);\n \t\tgoto out;\n \t}\n\n \tret = timer_group_get_irq(np, priv);\n \tif (ret < 0) {\n-\t\tpr_err(\"%s: cannot get timer irqs.\\n\", np->full_name);\n+\t\tpr_err(\"%pOF: cannot get timer irqs.\\n\", np);\n \t\tgoto out;\n \t}\n\ndiff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c\nindex 5ebd3f018295..c4dae27172b3 100644\n--- a/arch/powerpc/sysdev/msi_bitmap.c\n+++ b/arch/powerpc/sysdev/msi_bitmap.c\n@@ -86,13 +86,13 @@ int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp)\n \tp = of_get_property(bmp->of_node, \"msi-available-ranges\", &len);\n \tif (!p) {\n \t\tpr_debug(\"msi_bitmap: no msi-available-ranges property \" \\\n-\t\t\t \"found on %s\\n\", bmp->of_node->full_name);\n+\t\t\t \"found on %pOF\\n\", bmp->of_node);\n \t\treturn 1;\n \t}\n\n \tif (len % (2 * sizeof(u32)) != 0) {\n \t\tprintk(KERN_WARNING \"msi_bitmap: Malformed msi-available-ranges\"\n-\t\t       \" property on %s\\n\", bmp->of_node->full_name);\n+\t\t       \" property on %pOF\\n\", bmp->of_node);\n \t\treturn -EINVAL;\n \t}\n\ndiff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c\nindex 026bbc3b2c47..185a67e742a6 100644\n--- a/arch/powerpc/sysdev/mv64x60_dev.c\n+++ b/arch/powerpc/sysdev/mv64x60_dev.c\n@@ -452,8 +452,8 @@ static int __init mv64x60_device_setup(void)\n \t\terr = mv64x60_mpsc_device_setup(np, id++);\n \t\tif (err)\n \t\t\tprintk(KERN_ERR \"Failed to initialize MV64x60 \"\n-\t\t\t\t\t\"serial device %s: error %d.\\n\",\n-\t\t\t\t\tnp->full_name, err);\n+\t\t\t\t\t\"serial device %pOF: error %d.\\n\",\n+\t\t\t\t\tnp, err);\n \t}\n\n \tid = 0;\n@@ -463,8 +463,8 @@ static int __init mv64x60_device_setup(void)\n \t\tif (IS_ERR(pdev)) {\n \t\t\terr = PTR_ERR(pdev);\n \t\t\tprintk(KERN_ERR \"Failed to initialize MV64x60 \"\n-\t\t\t\t\t\"network block %s: error %d.\\n\",\n-\t\t\t\t\tnp->full_name, err);\n+\t\t\t\t\t\"network block %pOF: error %d.\\n\",\n+\t\t\t\t\tnp, err);\n \t\t\tcontinue;\n \t\t}\n \t\tfor_each_child_of_node(np, np2) {\n@@ -474,9 +474,9 @@ static int __init mv64x60_device_setup(void)\n \t\t\terr = mv64x60_eth_device_setup(np2, id2++, pdev);\n \t\t\tif (err)\n \t\t\t\tprintk(KERN_ERR \"Failed to initialize \"\n-\t\t\t\t\t\t\"MV64x60 network device %s: \"\n+\t\t\t\t\t\t\"MV64x60 network device %pOF: \"\n \t\t\t\t\t\t\"error %d.\\n\",\n-\t\t\t\t\t\tnp2->full_name, err);\n+\t\t\t\t\t\tnp2, err);\n \t\t}\n \t}\n\n@@ -485,8 +485,8 @@ static int __init mv64x60_device_setup(void)\n \t\terr = mv64x60_i2c_device_setup(np, id++);\n \t\tif (err)\n \t\t\tprintk(KERN_ERR \"Failed to initialize MV64x60 I2C \"\n-\t\t\t\t\t\"bus %s: error %d.\\n\",\n-\t\t\t\t\tnp->full_name, err);\n+\t\t\t\t\t\"bus %pOF: error %d.\\n\",\n+\t\t\t\t\tnp, err);\n \t}\n\n \t/* support up to one watchdog timer */\n@@ -494,8 +494,8 @@ static int __init mv64x60_device_setup(void)\n \tif (np) {\n \t\tif ((err = mv64x60_wdt_device_setup(np, id)))\n \t\t\tprintk(KERN_ERR \"Failed to initialize MV64x60 \"\n-\t\t\t\t\t\"Watchdog %s: error %d.\\n\",\n-\t\t\t\t\tnp->full_name, err);\n+\t\t\t\t\t\"Watchdog %pOF: error %d.\\n\",\n+\t\t\t\t\tnp, err);\n \t\tof_node_put(np);\n \t}\n\ndiff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c\nindex 330d56613c5a..5261750dacc4 100644\n--- a/arch/powerpc/sysdev/mv64x60_pci.c\n+++ b/arch/powerpc/sysdev/mv64x60_pci.c\n@@ -136,8 +136,8 @@ static int __init mv64x60_add_bridge(struct device_node *dev)\n \t/* Get bus range if any */\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int))\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t       \" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t       \" bus 0\\n\", dev);\n\n \those = pcibios_alloc_controller(dev);\n \tif (!hose)\ndiff --git a/arch/powerpc/sysdev/of_rtc.c b/arch/powerpc/sysdev/of_rtc.c\nindex 6f54b54b1328..153fdac4720f 100644\n--- a/arch/powerpc/sysdev/of_rtc.c\n+++ b/arch/powerpc/sysdev/of_rtc.c\n@@ -38,21 +38,21 @@ void __init of_instantiate_rtc(void)\n \t\t\tres = kmalloc(sizeof(*res), GFP_KERNEL);\n \t\t\tif (!res) {\n \t\t\t\tprintk(KERN_ERR \"OF RTC: Out of memory \"\n-\t\t\t\t       \"allocating resource structure for %s\\n\",\n-\t\t\t\t       node->full_name);\n+\t\t\t\t       \"allocating resource structure for %pOF\\n\",\n+\t\t\t\t       node);\n \t\t\t\tcontinue;\n \t\t\t}\n\n \t\t\terr = of_address_to_resource(node, 0, res);\n \t\t\tif (err) {\n \t\t\t\tprintk(KERN_ERR \"OF RTC: Error \"\n-\t\t\t\t       \"translating resources for %s\\n\",\n-\t\t\t\t       node->full_name);\n+\t\t\t\t       \"translating resources for %pOF\\n\",\n+\t\t\t\t       node);\n \t\t\t\tcontinue;\n \t\t\t}\n\n-\t\t\tprintk(KERN_INFO \"OF_RTC: %s is a %s @ 0x%llx-0x%llx\\n\",\n-\t\t\t       node->full_name, plat_name,\n+\t\t\tprintk(KERN_INFO \"OF_RTC: %pOF is a %s @ 0x%llx-0x%llx\\n\",\n+\t\t\t       node, plat_name,\n \t\t\t       (unsigned long long)res->start,\n \t\t\t       (unsigned long long)res->end);\n \t\t\tplatform_device_register_simple(plat_name, -1, res, 1);\ndiff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c\nindex ba95adf81d8d..ac7af8b5ffa1 100644\n--- a/arch/powerpc/sysdev/ppc4xx_cpm.c\n+++ b/arch/powerpc/sysdev/ppc4xx_cpm.c\n@@ -278,8 +278,8 @@ static int __init cpm_init(void)\n \tdcr_len = dcr_resource_len(np, 0);\n\n \tif (dcr_base == 0 || dcr_len == 0) {\n-\t\tprintk(KERN_ERR \"cpm: could not parse dcr property for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"cpm: could not parse dcr property for %pOF\\n\",\n+\t\t       np);\n \t\tret = -EINVAL;\n \t\tgoto node_put;\n \t}\n@@ -287,8 +287,8 @@ static int __init cpm_init(void)\n \tcpm.dcr_host = dcr_map(np, dcr_base, dcr_len);\n\n \tif (!DCR_MAP_OK(cpm.dcr_host)) {\n-\t\tprintk(KERN_ERR \"cpm: failed to map dcr property for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"cpm: failed to map dcr property for %pOF\\n\",\n+\t\t       np);\n \t\tret = -EINVAL;\n \t\tgoto node_put;\n \t}\ndiff --git a/arch/powerpc/sysdev/ppc4xx_gpio.c b/arch/powerpc/sysdev/ppc4xx_gpio.c\nindex 5382d04dd872..2238e369cde4 100644\n--- a/arch/powerpc/sysdev/ppc4xx_gpio.c\n+++ b/arch/powerpc/sysdev/ppc4xx_gpio.c\n@@ -198,8 +198,7 @@ static int __init ppc4xx_add_gpiochips(void)\n \t\t\tgoto err;\n \t\tcontinue;\n err:\n-\t\tpr_err(\"%s: registration failed with status %d\\n\",\n-\t\t       np->full_name, ret);\n+\t\tpr_err(\"%pOF: registration failed with status %d\\n\", np, ret);\n \t\tkfree(ppc4xx_gc);\n \t\t/* try others anyway */\n \t}\ndiff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c\nindex 590dab4f47d6..d50417e23add 100644\n--- a/arch/powerpc/sysdev/ppc4xx_msi.c\n+++ b/arch/powerpc/sysdev/ppc4xx_msi.c\n@@ -233,8 +233,7 @@ static int ppc4xx_msi_probe(struct platform_device *dev)\n \t/* Get MSI ranges */\n \terr = of_address_to_resource(dev->dev.of_node, 0, &res);\n \tif (err) {\n-\t\tdev_err(&dev->dev, \"%s resource error!\\n\",\n-\t\t\tdev->dev.of_node->full_name);\n+\t\tdev_err(&dev->dev, \"%pOF resource error!\\n\", dev->dev.of_node);\n \t\tgoto error_out;\n \t}\n\ndiff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c\nindex 086aca69ecae..7adb879590a2 100644\n--- a/arch/powerpc/sysdev/ppc4xx_pci.c\n+++ b/arch/powerpc/sysdev/ppc4xx_pci.c\n@@ -127,9 +127,9 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,\n \t\t * within 32 bits space\n \t\t */\n \t\tif (cpu_addr != 0 || pci_addr > 0xffffffff) {\n-\t\t\tprintk(KERN_WARNING \"%s: Ignored unsupported dma range\"\n+\t\t\tprintk(KERN_WARNING \"%pOF: Ignored unsupported dma range\"\n \t\t\t       \" 0x%016llx...0x%016llx -> 0x%016llx\\n\",\n-\t\t\t       hose->dn->full_name,\n+\t\t\t       hose->dn,\n \t\t\t       pci_addr, pci_addr + size - 1, cpu_addr);\n \t\t\tcontinue;\n \t\t}\n@@ -152,8 +152,7 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,\n\n \t/* We only support one global DMA offset */\n \tif (dma_offset_set && pci_dram_offset != res->start) {\n-\t\tprintk(KERN_ERR \"%s: dma-ranges(s) mismatch\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: dma-ranges(s) mismatch\\n\", hose->dn);\n \t\treturn -ENXIO;\n \t}\n\n@@ -161,17 +160,16 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,\n \t * DMA bounce buffers\n \t */\n \tif (size < total_memory) {\n-\t\tprintk(KERN_ERR \"%s: dma-ranges too small \"\n+\t\tprintk(KERN_ERR \"%pOF: dma-ranges too small \"\n \t\t       \"(size=%llx total_memory=%llx)\\n\",\n-\t\t       hose->dn->full_name, size, (u64)total_memory);\n+\t\t       hose->dn, size, (u64)total_memory);\n \t\treturn -ENXIO;\n \t}\n\n \t/* Check we are a power of 2 size and that base is a multiple of size*/\n \tif ((size & (size - 1)) != 0  ||\n \t    (res->start & (size - 1)) != 0) {\n-\t\tprintk(KERN_ERR \"%s: dma-ranges unaligned\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: dma-ranges unaligned\\n\", hose->dn);\n \t\treturn -ENXIO;\n \t}\n\n@@ -181,8 +179,8 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,\n \tif (res->end > 0xffffffff &&\n \t    !(of_device_is_compatible(hose->dn, \"ibm,plb-pciex-460sx\")\n \t      || of_device_is_compatible(hose->dn, \"ibm,plb-pciex-476fpe\"))) {\n-\t\tprintk(KERN_ERR \"%s: dma-ranges outside of 32 bits space\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: dma-ranges outside of 32 bits space\\n\",\n+\t\t       hose->dn);\n \t\treturn -ENXIO;\n \t}\n  out:\n@@ -233,8 +231,7 @@ static int __init ppc4xx_setup_one_pci_PMM(struct pci_controller\t*hose,\n \t */\n \tif ((plb_addr + size) > 0xffffffffull || !is_power_of_2(size) ||\n \t    size < 0x1000 || (plb_addr & (size - 1)) != 0) {\n-\t\tprintk(KERN_WARNING \"%s: Resource out of range\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_WARNING \"%pOF: Resource out of range\\n\", hose->dn);\n \t\treturn -1;\n \t}\n \tma = (0xffffffffu << ilog2(size)) | 1;\n@@ -266,8 +263,7 @@ static void __init ppc4xx_configure_pci_PMMs(struct pci_controller *hose,\n \t\tif (!(res->flags & IORESOURCE_MEM))\n \t\t\tcontinue;\n \t\tif (j > 2) {\n-\t\t\tprintk(KERN_WARNING \"%s: Too many ranges\\n\",\n-\t\t\t       hose->dn->full_name);\n+\t\t\tprintk(KERN_WARNING \"%pOF: Too many ranges\\n\", hose->dn);\n \t\t\tbreak;\n \t\t}\n\n@@ -292,8 +288,8 @@ static void __init ppc4xx_configure_pci_PMMs(struct pci_controller *hose,\n \tif (j <= 2 && !found_isa_hole && hose->isa_mem_size)\n \t\tif (ppc4xx_setup_one_pci_PMM(hose, reg, hose->isa_mem_phys, 0,\n \t\t\t\t\t     hose->isa_mem_size, 0, j) == 0)\n-\t\t\tprintk(KERN_INFO \"%s: Legacy ISA memory support enabled\\n\",\n-\t\t\t       hose->dn->full_name);\n+\t\t\tprintk(KERN_INFO \"%pOF: Legacy ISA memory support enabled\\n\",\n+\t\t\t       hose->dn);\n }\n\n static void __init ppc4xx_configure_pci_PTMs(struct pci_controller *hose,\n@@ -333,21 +329,20 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)\n\n \t/* Check if device is enabled */\n \tif (!of_device_is_available(np)) {\n-\t\tprintk(KERN_INFO \"%s: Port disabled via device-tree\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_INFO \"%pOF: Port disabled via device-tree\\n\", np);\n \t\treturn;\n \t}\n\n \t/* Fetch config space registers address */\n \tif (of_address_to_resource(np, 0, &rsrc_cfg)) {\n-\t\tprintk(KERN_ERR \"%s: Can't get PCI config register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get PCI config register base !\",\n+\t\t       np);\n \t\treturn;\n \t}\n \t/* Fetch host bridge internal registers address */\n \tif (of_address_to_resource(np, 3, &rsrc_reg)) {\n-\t\tprintk(KERN_ERR \"%s: Can't get PCI internal register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get PCI internal register base !\",\n+\t\t       np);\n \t\treturn;\n \t}\n\n@@ -361,7 +356,7 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)\n \t/* Map registers */\n \treg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg));\n \tif (reg == NULL) {\n-\t\tprintk(KERN_ERR \"%s: Can't map registers !\", np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't map registers !\", np);\n \t\tgoto fail;\n \t}\n\n@@ -423,8 +418,8 @@ static int __init ppc4xx_setup_one_pcix_POM(struct pci_controller\t*hose,\n\n \tif (!is_power_of_2(size) || size < 0x1000 ||\n \t    (plb_addr & (size - 1)) != 0) {\n-\t\tprintk(KERN_WARNING \"%s: Resource out of range\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_WARNING \"%pOF: Resource out of range\\n\",\n+\t\t       hose->dn);\n \t\treturn -1;\n \t}\n\n@@ -467,8 +462,7 @@ static void __init ppc4xx_configure_pcix_POMs(struct pci_controller *hose,\n \t\tif (!(res->flags & IORESOURCE_MEM))\n \t\t\tcontinue;\n \t\tif (j > 1) {\n-\t\t\tprintk(KERN_WARNING \"%s: Too many ranges\\n\",\n-\t\t\t       hose->dn->full_name);\n+\t\t\tprintk(KERN_WARNING \"%pOF: Too many ranges\\n\", hose->dn);\n \t\t\tbreak;\n \t\t}\n\n@@ -493,8 +487,8 @@ static void __init ppc4xx_configure_pcix_POMs(struct pci_controller *hose,\n \tif (j <= 1 && !found_isa_hole && hose->isa_mem_size)\n \t\tif (ppc4xx_setup_one_pcix_POM(hose, reg, hose->isa_mem_phys, 0,\n \t\t\t\t\t      hose->isa_mem_size, 0, j) == 0)\n-\t\t\tprintk(KERN_INFO \"%s: Legacy ISA memory support enabled\\n\",\n-\t\t\t       hose->dn->full_name);\n+\t\t\tprintk(KERN_INFO \"%pOF: Legacy ISA memory support enabled\\n\",\n+\t\t\t       hose->dn);\n }\n\n static void __init ppc4xx_configure_pcix_PIMs(struct pci_controller *hose,\n@@ -539,14 +533,14 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)\n\n \t/* Fetch config space registers address */\n \tif (of_address_to_resource(np, 0, &rsrc_cfg)) {\n-\t\tprintk(KERN_ERR \"%s:Can't get PCI-X config register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get PCI-X config register base !\",\n+\t\t       np);\n \t\treturn;\n \t}\n \t/* Fetch host bridge internal registers address */\n \tif (of_address_to_resource(np, 3, &rsrc_reg)) {\n-\t\tprintk(KERN_ERR \"%s: Can't get PCI-X internal register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get PCI-X internal register base !\",\n+\t\t       np);\n \t\treturn;\n \t}\n\n@@ -568,7 +562,7 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)\n \t/* Map registers */\n \treg = ioremap(rsrc_reg.start, resource_size(&rsrc_reg));\n \tif (reg == NULL) {\n-\t\tprintk(KERN_ERR \"%s: Can't map registers !\", np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't map registers !\", np);\n \t\tgoto fail;\n \t}\n\n@@ -1246,8 +1240,8 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port)\n\n \tmbase = ioremap(port->cfg_space.start + 0x10000000, 0x1000);\n \tif (mbase == NULL) {\n-\t\tprintk(KERN_ERR \"%s: Can't map internal config space !\",\n-\t\t\tport->node->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't map internal config space !\",\n+\t\t\tport->node);\n \t\tgoto done;\n \t}\n\n@@ -1389,7 +1383,7 @@ static void __init ppc_476fpe_pciex_check_link(struct ppc4xx_pciex_port *port)\n \t\t                    port->index);\n \t\treturn;\n \t}\n-\n+\n \twhile (timeout_ms--) {\n \t\tval = in_le32(mbase + PECFG_TLDLP);\n\n@@ -1448,8 +1442,7 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np)\n \t\tppc4xx_pciex_hwops = &ppc_476fpe_pcie_hwops;\n #endif\n \tif (ppc4xx_pciex_hwops == NULL) {\n-\t\tprintk(KERN_WARNING \"PCIE: unknown host type %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_WARNING \"PCIE: unknown host type %pOF\\n\", np);\n \t\treturn -ENODEV;\n \t}\n\n@@ -1730,8 +1723,7 @@ static int __init ppc4xx_setup_one_pciex_POM(struct ppc4xx_pciex_port\t*port,\n \t    (index < 2 && size < 0x100000) ||\n \t    (index == 2 && size < 0x100) ||\n \t    (plb_addr & (size - 1)) != 0) {\n-\t\tprintk(KERN_WARNING \"%s: Resource out of range\\n\",\n-\t\t       hose->dn->full_name);\n+\t\tprintk(KERN_WARNING \"%pOF: Resource out of range\\n\", hose->dn);\n \t\treturn -1;\n \t}\n\n@@ -1807,8 +1799,8 @@ static void __init ppc4xx_configure_pciex_POMs(struct ppc4xx_pciex_port *port,\n \t\tif (!(res->flags & IORESOURCE_MEM))\n \t\t\tcontinue;\n \t\tif (j > 1) {\n-\t\t\tprintk(KERN_WARNING \"%s: Too many ranges\\n\",\n-\t\t\t       port->node->full_name);\n+\t\t\tprintk(KERN_WARNING \"%pOF: Too many ranges\\n\",\n+\t\t\t       port->node);\n \t\t\tbreak;\n \t\t}\n\n@@ -1834,8 +1826,8 @@ static void __init ppc4xx_configure_pciex_POMs(struct ppc4xx_pciex_port *port,\n \t\tif (ppc4xx_setup_one_pciex_POM(port, hose, mbase,\n \t\t\t\t\t       hose->isa_mem_phys, 0,\n \t\t\t\t\t       hose->isa_mem_size, 0, j) == 0)\n-\t\t\tprintk(KERN_INFO \"%s: Legacy ISA memory support enabled\\n\",\n-\t\t\t       hose->dn->full_name);\n+\t\t\tprintk(KERN_INFO \"%pOF: Legacy ISA memory support enabled\\n\",\n+\t\t\t       hose->dn);\n\n \t/* Configure IO, always 64K starting at 0. We hard wire it to 64K !\n \t * Note also that it -has- to be region index 2 on this HW\n@@ -1970,8 +1962,8 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)\n \t\t\t\t   (hose->first_busno + 1) * 0x100000,\n \t\t\t\t   busses * 0x100000);\n \t\tif (cfg_data == NULL) {\n-\t\t\tprintk(KERN_ERR \"%s: Can't map external config space !\",\n-\t\t\t       port->node->full_name);\n+\t\t\tprintk(KERN_ERR \"%pOF: Can't map external config space !\",\n+\t\t\t       port->node);\n \t\t\tgoto fail;\n \t\t}\n \t\those->cfg_data = cfg_data;\n@@ -1982,13 +1974,13 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)\n \t */\n \tmbase = ioremap(port->cfg_space.start + 0x10000000, 0x1000);\n \tif (mbase == NULL) {\n-\t\tprintk(KERN_ERR \"%s: Can't map internal config space !\",\n-\t\t       port->node->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't map internal config space !\",\n+\t\t       port->node);\n \t\tgoto fail;\n \t}\n \those->cfg_addr = mbase;\n\n-\tpr_debug(\"PCIE %s, bus %d..%d\\n\", port->node->full_name,\n+\tpr_debug(\"PCIE %pOF, bus %d..%d\\n\", port->node,\n \t\t hose->first_busno, hose->last_busno);\n \tpr_debug(\"     config space mapped at: root @0x%p, other @0x%p\\n\",\n \t\t hose->cfg_addr, hose->cfg_data);\n@@ -2100,14 +2092,13 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)\n \t/* Get the port number from the device-tree */\n \tpval = of_get_property(np, \"port\", NULL);\n \tif (pval == NULL) {\n-\t\tprintk(KERN_ERR \"PCIE: Can't find port number for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"PCIE: Can't find port number for %pOF\\n\", np);\n \t\treturn;\n \t}\n \tportno = *pval;\n \tif (portno >= ppc4xx_pciex_port_count) {\n-\t\tprintk(KERN_ERR \"PCIE: port number out of range for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"PCIE: port number out of range for %pOF\\n\",\n+\t\t       np);\n \t\treturn;\n \t}\n \tport = &ppc4xx_pciex_ports[portno];\n@@ -2125,8 +2116,8 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)\n \tif (ppc4xx_pciex_hwops->want_sdr) {\n \t\tpval = of_get_property(np, \"sdr-base\", NULL);\n \t\tif (pval == NULL) {\n-\t\t\tprintk(KERN_ERR \"PCIE: missing sdr-base for %s\\n\",\n-\t\t\t       np->full_name);\n+\t\t\tprintk(KERN_ERR \"PCIE: missing sdr-base for %pOF\\n\",\n+\t\t\t       np);\n \t\t\treturn;\n \t\t}\n \t\tport->sdr_base = *pval;\n@@ -2142,29 +2133,26 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)\n \t} else if (!strcmp(val, \"pci\")) {\n \t\tport->endpoint = 0;\n \t} else {\n-\t\tprintk(KERN_ERR \"PCIE: missing or incorrect device_type for %s\\n\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"PCIE: missing or incorrect device_type for %pOF\\n\",\n+\t\t       np);\n \t\treturn;\n \t}\n\n \t/* Fetch config space registers address */\n \tif (of_address_to_resource(np, 0, &port->cfg_space)) {\n-\t\tprintk(KERN_ERR \"%s: Can't get PCI-E config space !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get PCI-E config space !\", np);\n \t\treturn;\n \t}\n \t/* Fetch host bridge internal registers address */\n \tif (of_address_to_resource(np, 1, &port->utl_regs)) {\n-\t\tprintk(KERN_ERR \"%s: Can't get UTL register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get UTL register base !\", np);\n \t\treturn;\n \t}\n\n \t/* Map DCRs */\n \tdcrs = dcr_resource_start(np, 0);\n \tif (dcrs == 0) {\n-\t\tprintk(KERN_ERR \"%s: Can't get DCR register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get DCR register base !\", np);\n \t\treturn;\n \t}\n \tport->dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));\ndiff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c\nindex d41134d2f786..5e36508b2a70 100644\n--- a/arch/powerpc/sysdev/ppc4xx_soc.c\n+++ b/arch/powerpc/sysdev/ppc4xx_soc.c\n@@ -90,7 +90,7 @@ static int __init ppc4xx_l2c_probe(void)\n \t/* Get l2 cache size */\n \tprop = of_get_property(np, \"cache-size\", NULL);\n \tif (prop == NULL) {\n-\t\tprintk(KERN_ERR \"%s: Can't get cache-size!\\n\", np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get cache-size!\\n\", np);\n \t\tof_node_put(np);\n \t\treturn -ENODEV;\n \t}\n@@ -99,8 +99,7 @@ static int __init ppc4xx_l2c_probe(void)\n \t/* Map DCRs */\n \tdcrreg = of_get_property(np, \"dcr-reg\", &len);\n \tif (!dcrreg || (len != 4 * sizeof(u32))) {\n-\t\tprintk(KERN_ERR \"%s: Can't get DCR register base !\",\n-\t\t       np->full_name);\n+\t\tprintk(KERN_ERR \"%pOF: Can't get DCR register base !\", np);\n \t\tof_node_put(np);\n \t\treturn -ENODEV;\n \t}\ndiff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c\nindex 76ea32c1b664..0f6fd5d04d33 100644\n--- a/arch/powerpc/sysdev/scom.c\n+++ b/arch/powerpc/sysdev/scom.c\n@@ -194,12 +194,13 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,\n\n \tent->dn = of_node_get(dn);\n \tsnprintf(ent->name, 16, \"%08x\", i);\n-\tent->path.data = (void*) dn->full_name;\n-\tent->path.size = strlen(dn->full_name);\n+\tent->path.data = (void*)kasprintf(GFP_KERNEL, \"%pOF\", dn);\n+\tent->path.size = strlen((char *)ent->path.data);\n\n \tdir = debugfs_create_dir(ent->name, root);\n \tif (!dir) {\n \t\tof_node_put(dn);\n+\t\tkfree(ent->path.data);\n \t\tkfree(ent);\n \t\treturn -1;\n \t}\ndiff --git a/arch/powerpc/sysdev/simple_gpio.c b/arch/powerpc/sysdev/simple_gpio.c\nindex 6afddae2fb47..f02d4576138c 100644\n--- a/arch/powerpc/sysdev/simple_gpio.c\n+++ b/arch/powerpc/sysdev/simple_gpio.c\n@@ -142,7 +142,6 @@ void __init simple_gpiochip_init(const char *compatible)\n \t\t}\n \t\tcontinue;\n err:\n-\t\tpr_err(\"%s: registration failed, status %d\\n\",\n-\t\t       np->full_name, ret);\n+\t\tpr_err(\"%pOF: registration failed, status %d\\n\", np, ret);\n \t}\n }\ndiff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c\nindex 5692dd569b9b..28ff1f53cefc 100644\n--- a/arch/powerpc/sysdev/tsi108_pci.c\n+++ b/arch/powerpc/sysdev/tsi108_pci.c\n@@ -213,8 +213,8 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary)\n \t/* Get bus range if any */\n \tbus_range = of_get_property(dev, \"bus-range\", &len);\n \tif (bus_range == NULL || len < 2 * sizeof(int)) {\n-\t\tprintk(KERN_WARNING \"Can't get bus-range for %s, assume\"\n-\t\t       \" bus 0\\n\", dev->full_name);\n+\t\tprintk(KERN_WARNING \"Can't get bus-range for %pOF, assume\"\n+\t\t       \" bus 0\\n\", dev);\n \t}\n\n \those = pcibios_alloc_controller(dev);\ndiff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c\nindex a00949f3e378..8b4dd0da0839 100644\n--- a/arch/powerpc/sysdev/uic.c\n+++ b/arch/powerpc/sysdev/uic.c\n@@ -243,16 +243,16 @@ static struct uic * __init uic_init_one(struct device_node *node)\n \traw_spin_lock_init(&uic->lock);\n \tindexp = of_get_property(node, \"cell-index\", &len);\n \tif (!indexp || (len != sizeof(u32))) {\n-\t\tprintk(KERN_ERR \"uic: Device node %s has missing or invalid \"\n-\t\t       \"cell-index property\\n\", node->full_name);\n+\t\tprintk(KERN_ERR \"uic: Device node %pOF has missing or invalid \"\n+\t\t       \"cell-index property\\n\", node);\n \t\treturn NULL;\n \t}\n \tuic->index = *indexp;\n\n \tdcrreg = of_get_property(node, \"dcr-reg\", &len);\n \tif (!dcrreg || (len != 2*sizeof(u32))) {\n-\t\tprintk(KERN_ERR \"uic: Device node %s has missing or invalid \"\n-\t\t       \"dcr-reg property\\n\", node->full_name);\n+\t\tprintk(KERN_ERR \"uic: Device node %pOF has missing or invalid \"\n+\t\t       \"dcr-reg property\\n\", node);\n \t\treturn NULL;\n \t}\n \tuic->dcrbase = *dcrreg;\n@@ -292,7 +292,7 @@ void __init uic_init_tree(void)\n \t\t      * top-level interrupt controller */\n \tprimary_uic = uic_init_one(np);\n \tif (!primary_uic)\n-\t\tpanic(\"Unable to initialize primary UIC %s\\n\", np->full_name);\n+\t\tpanic(\"Unable to initialize primary UIC %pOF\\n\", np);\n\n \tirq_set_default_host(primary_uic->irqhost);\n \tof_node_put(np);\n@@ -306,8 +306,8 @@ void __init uic_init_tree(void)\n\n \t\t\tuic = uic_init_one(np);\n \t\t\tif (! uic)\n-\t\t\t\tpanic(\"Unable to initialize a secondary UIC %s\\n\",\n-\t\t\t\t      np->full_name);\n+\t\t\t\tpanic(\"Unable to initialize a secondary UIC %pOF\\n\",\n+\t\t\t\t      np);\n\n \t\t\tcascade_virq = irq_of_parse_and_map(np, 0);\n\ndiff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c\nindex 0f95476b01f6..dd563c82046b 100644\n--- a/arch/powerpc/sysdev/xive/native.c\n+++ b/arch/powerpc/sysdev/xive/native.c\n@@ -551,7 +551,7 @@ bool xive_native_init(void)\n \t\tpr_devel(\"not found !\\n\");\n \t\treturn false;\n \t}\n-\tpr_devel(\"Found %s\\n\", np->full_name);\n+\tpr_devel(\"Found %pOF\\n\", np);\n\n \t/* Resource 1 is HV window */\n \tif (of_address_to_resource(np, 1, &r)) {\n",
    "prefixes": []
}