hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

c6x: Convert to using %pOF instead of full_name 

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: Mark Salter <msalter@redhat.com>
This commit is contained in:
Rob Herring 2017-07-18 16:42:43 -05:00 committed by Mark Salter
parent 98cd249cf9
commit 636d421178
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/c6x/platforms/megamod-pic.c
View File

@ -208,14 +208,14 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
pic = kzalloc(sizeof(struct megamod_pic), GFP_KERNEL); pic = kzalloc(sizeof(struct megamod_pic), GFP_KERNEL);
if (!pic) { if (!pic) {
pr_err("%s: Could not alloc PIC structure.\n", np->full_name); pr_err("%pOF: Could not alloc PIC structure.\n", np);
return NULL; return NULL;
} }
pic->irqhost = irq_domain_add_linear(np, NR_COMBINERS * 32, pic->irqhost = irq_domain_add_linear(np, NR_COMBINERS * 32,
&megamod_domain_ops, pic); &megamod_domain_ops, pic);
if (!pic->irqhost) { if (!pic->irqhost) {
pr_err("%s: Could not alloc host.\n", np->full_name); pr_err("%pOF: Could not alloc host.\n", np);
goto error_free; goto error_free;
} }
@ -225,7 +225,7 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
pic->regs = of_iomap(np, 0); pic->regs = of_iomap(np, 0);
if (!pic->regs) { if (!pic->regs) {
pr_err("%s: Could not map registers.\n", np->full_name); pr_err("%pOF: Could not map registers.\n", np);
goto error_free; goto error_free;
} }
@ -253,8 +253,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
irq_data = irq_get_irq_data(irq); irq_data = irq_get_irq_data(irq);
if (!irq_data) { if (!irq_data) {
pr_err("%s: combiner-%d no irq_data for virq %d!\n", pr_err("%pOF: combiner-%d no irq_data for virq %d!\n",
np->full_name, i, irq); np, i, irq);
continue; continue;
} }
@ -265,16 +265,16 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
* of the core priority interrupts (4 - 15). * of the core priority interrupts (4 - 15).
*/ */
if (hwirq < 4 || hwirq >= NR_PRIORITY_IRQS) { if (hwirq < 4 || hwirq >= NR_PRIORITY_IRQS) {
pr_err("%s: combiner-%d core irq %ld out of range!\n", pr_err("%pOF: combiner-%d core irq %ld out of range!\n",
np->full_name, i, hwirq); np, i, hwirq);
continue; continue;
} }
/* record the mapping */ /* record the mapping */
mapping[hwirq - 4] = i; mapping[hwirq - 4] = i;
pr_debug("%s: combiner-%d cascading to hwirq %ld\n", pr_debug("%pOF: combiner-%d cascading to hwirq %ld\n",
np->full_name, i, hwirq); np, i, hwirq);
cascade_data[i].pic = pic; cascade_data[i].pic = pic;
cascade_data[i].index = i; cascade_data[i].index = i;
@ -290,8 +290,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
/* Finally, set up the MUX registers */ /* Finally, set up the MUX registers */
for (i = 0; i < NR_MUX_OUTPUTS; i++) { for (i = 0; i < NR_MUX_OUTPUTS; i++) {
if (mapping[i] != IRQ_UNMAPPED) { if (mapping[i] != IRQ_UNMAPPED) {
pr_debug("%s: setting mux %d to priority %d\n", pr_debug("%pOF: setting mux %d to priority %d\n",
np->full_name, mapping[i], i + 4); np, mapping[i], i + 4);
set_megamod_mux(pic, mapping[i], i); set_megamod_mux(pic, mapping[i], i);
} }
} }

4
arch/c6x/platforms/plldata.c
View File

@ -436,8 +436,8 @@ void __init c64x_setup_clocks(void)
err = of_property_read_u32(node, "clock-frequency", &val); err = of_property_read_u32(node, "clock-frequency", &val);
if (err || val == 0) { if (err || val == 0) {
pr_err("%s: no clock-frequency found! Using %dMHz\n", pr_err("%pOF: no clock-frequency found! Using %dMHz\n",
node->full_name, (int)val / 1000000); node, (int)val / 1000000);
val = 25000000; val = 25000000;
} }
clkin1.rate = val; clkin1.rate = val;

8
arch/c6x/platforms/timer64.c
View File

@ -204,14 +204,14 @@ void __init timer64_init(void)
timer = of_iomap(np, 0); timer = of_iomap(np, 0);
if (!timer) { if (!timer) {
pr_debug("%s: Cannot map timer registers.\n", np->full_name); pr_debug("%pOF: Cannot map timer registers.\n", np);
goto out; goto out;
} }
pr_debug("%s: Timer registers=%p.\n", np->full_name, timer); pr_debug("%pOF: Timer registers=%p.\n", np, timer);
cd->irq = irq_of_parse_and_map(np, 0); cd->irq = irq_of_parse_and_map(np, 0);
if (cd->irq == NO_IRQ) { if (cd->irq == NO_IRQ) {
pr_debug("%s: Cannot find interrupt.\n", np->full_name); pr_debug("%pOF: Cannot find interrupt.\n", np);
iounmap(timer); iounmap(timer);
goto out; goto out;
} }
@ -229,7 +229,7 @@ void __init timer64_init(void)
dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED); dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED);
} }
pr_debug("%s: Timer irq=%d.\n", np->full_name, cd->irq); pr_debug("%pOF: Timer irq=%d.\n", np, cd->irq);
clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5); clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5);