lkml.org 
[lkml]   [2018]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] MIPS: Convert to using %pOFn instead of device_node.name
    Date
    In preparation to remove the node name pointer from struct device_node,
    convert printf users to use the %pOFn format specifier.

    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Paul Burton <paul.burton@mips.com>
    Cc: James Hogan <jhogan@kernel.org>
    Cc: John Crispin <john@phrozen.org>
    Cc: linux-mips@linux-mips.org
    Signed-off-by: Rob Herring <robh@kernel.org>
    ---
    arch/mips/cavium-octeon/octeon-irq.c | 16 ++++++++--------
    arch/mips/netlogic/common/irq.c | 14 +++++++-------
    arch/mips/ralink/cevt-rt3352.c | 6 +++---
    arch/mips/ralink/ill_acc.c | 2 +-
    4 files changed, 19 insertions(+), 19 deletions(-)

    diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
    index 8272d8c648ca..cc1d8525e651 100644
    --- a/arch/mips/cavium-octeon/octeon-irq.c
    +++ b/arch/mips/cavium-octeon/octeon-irq.c
    @@ -1180,8 +1180,8 @@ static int octeon_irq_gpio_xlat(struct irq_domain *d,
    type = IRQ_TYPE_LEVEL_LOW;
    break;
    default:
    - pr_err("Error: (%s) Invalid irq trigger specification: %x\n",
    - node->name,
    + pr_err("Error: (%pOFn) Invalid irq trigger specification: %x\n",
    + node,
    trigger);
    type = IRQ_TYPE_LEVEL_LOW;
    break;
    @@ -2271,8 +2271,8 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,

    parent_irq = irq_of_parse_and_map(ciu_node, 0);
    if (!parent_irq) {
    - pr_err("ERROR: Couldn't acquire parent_irq for %s\n",
    - ciu_node->name);
    + pr_err("ERROR: Couldn't acquire parent_irq for %pOFn\n",
    + ciu_node);
    return -EINVAL;
    }

    @@ -2283,7 +2283,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,

    addr = of_get_address(ciu_node, 0, NULL, NULL);
    if (!addr) {
    - pr_err("ERROR: Couldn't acquire reg(0) %s\n", ciu_node->name);
    + pr_err("ERROR: Couldn't acquire reg(0) %pOFn\n", ciu_node);
    return -EINVAL;
    }
    host_data->raw_reg = (u64)phys_to_virt(
    @@ -2291,7 +2291,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,

    addr = of_get_address(ciu_node, 1, NULL, NULL);
    if (!addr) {
    - pr_err("ERROR: Couldn't acquire reg(1) %s\n", ciu_node->name);
    + pr_err("ERROR: Couldn't acquire reg(1) %pOFn\n", ciu_node);
    return -EINVAL;
    }
    host_data->en_reg = (u64)phys_to_virt(
    @@ -2299,8 +2299,8 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,

    r = of_property_read_u32(ciu_node, "cavium,max-bits", &val);
    if (r) {
    - pr_err("ERROR: Couldn't read cavium,max-bits from %s\n",
    - ciu_node->name);
    + pr_err("ERROR: Couldn't read cavium,max-bits from %pOFn\n",
    + ciu_node);
    return r;
    }
    host_data->max_bits = val;
    diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
    index f4961bc9a61d..cf33dd8a487e 100644
    --- a/arch/mips/netlogic/common/irq.c
    +++ b/arch/mips/netlogic/common/irq.c
    @@ -291,7 +291,7 @@ static int __init xlp_of_pic_init(struct device_node *node,
    /* we need a hack to get the PIC's SoC chip id */
    ret = of_address_to_resource(node, 0, &res);
    if (ret < 0) {
    - pr_err("PIC %s: reg property not found!\n", node->name);
    + pr_err("PIC %pOFn: reg property not found!\n", node);
    return -EINVAL;
    }

    @@ -304,21 +304,21 @@ static int __init xlp_of_pic_init(struct device_node *node,
    break;
    }
    if (socid == NLM_NR_NODES) {
    - pr_err("PIC %s: Node mapping for bus %d not found!\n",
    - node->name, bus);
    + pr_err("PIC %pOFn: Node mapping for bus %d not found!\n",
    + node, bus);
    return -EINVAL;
    }
    } else {
    socid = (res.start >> 18) & 0x3;
    if (!nlm_node_present(socid)) {
    - pr_err("PIC %s: node %d does not exist!\n",
    - node->name, socid);
    + pr_err("PIC %pOFn: node %d does not exist!\n",
    + node, socid);
    return -EINVAL;
    }
    }

    if (!nlm_node_present(socid)) {
    - pr_err("PIC %s: node %d does not exist!\n", node->name, socid);
    + pr_err("PIC %pOFn: node %d does not exist!\n", node, socid);
    return -EINVAL;
    }

    @@ -326,7 +326,7 @@ static int __init xlp_of_pic_init(struct device_node *node,
    nlm_irq_to_xirq(socid, PIC_IRQ_BASE), PIC_IRQ_BASE,
    &xlp_pic_irq_domain_ops, NULL);
    if (xlp_pic_domain == NULL) {
    - pr_err("PIC %s: Creating legacy domain failed!\n", node->name);
    + pr_err("PIC %pOFn: Creating legacy domain failed!\n", node);
    return -EINVAL;
    }
    pr_info("Node %d: IRQ domain created for PIC@%pR\n", socid, &res);
    diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c
    index 92f284d2b802..61a08943eb2f 100644
    --- a/arch/mips/ralink/cevt-rt3352.c
    +++ b/arch/mips/ralink/cevt-rt3352.c
    @@ -134,7 +134,7 @@ static int __init ralink_systick_init(struct device_node *np)
    systick.dev.min_delta_ticks = 0x3;
    systick.dev.irq = irq_of_parse_and_map(np, 0);
    if (!systick.dev.irq) {
    - pr_err("%s: request_irq failed", np->name);
    + pr_err("%pOFn: request_irq failed", np);
    return -EINVAL;
    }

    @@ -146,8 +146,8 @@ static int __init ralink_systick_init(struct device_node *np)

    clockevents_register_device(&systick.dev);

    - pr_info("%s: running - mult: %d, shift: %d\n",
    - np->name, systick.dev.mult, systick.dev.shift);
    + pr_info("%pOFn: running - mult: %d, shift: %d\n",
    + np, systick.dev.mult, systick.dev.shift);

    return 0;
    }
    diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c
    index 765d5ba98fa2..fc056f2acfeb 100644
    --- a/arch/mips/ralink/ill_acc.c
    +++ b/arch/mips/ralink/ill_acc.c
    @@ -62,7 +62,7 @@ static int __init ill_acc_of_setup(void)

    pdev = of_find_device_by_node(np);
    if (!pdev) {
    - pr_err("%s: failed to lookup pdev\n", np->name);
    + pr_err("%pOFn: failed to lookup pdev\n", np);
    return -EINVAL;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-28 03:55    [W:4.044 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site