diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:42:43 -0400 |
---|---|---|
committer | Mark Salter <msalter@redhat.com> | 2017-08-24 09:35:40 -0400 |
commit | 636d42117800db1a994726fcf017e3633db832a5 (patch) | |
tree | e607fe7bb3aa6d3ef24c2b24a9d2f609be0f40a9 | |
parent | 98cd249cf9d2c7e2322fbf20c454c019e141a28b (diff) |
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>
-rw-r--r-- | arch/c6x/platforms/megamod-pic.c | 22 | ||||
-rw-r--r-- | arch/c6x/platforms/plldata.c | 4 | ||||
-rw-r--r-- | arch/c6x/platforms/timer64.c | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c index 43afc03e4125..9519fa5f97d0 100644 --- a/arch/c6x/platforms/megamod-pic.c +++ b/arch/c6x/platforms/megamod-pic.c | |||
@@ -208,14 +208,14 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) | |||
208 | 208 | ||
209 | pic = kzalloc(sizeof(struct megamod_pic), GFP_KERNEL); | 209 | pic = kzalloc(sizeof(struct megamod_pic), GFP_KERNEL); |
210 | if (!pic) { | 210 | if (!pic) { |
211 | pr_err("%s: Could not alloc PIC structure.\n", np->full_name); | 211 | pr_err("%pOF: Could not alloc PIC structure.\n", np); |
212 | return NULL; | 212 | return NULL; |
213 | } | 213 | } |
214 | 214 | ||
215 | pic->irqhost = irq_domain_add_linear(np, NR_COMBINERS * 32, | 215 | pic->irqhost = irq_domain_add_linear(np, NR_COMBINERS * 32, |
216 | &megamod_domain_ops, pic); | 216 | &megamod_domain_ops, pic); |
217 | if (!pic->irqhost) { | 217 | if (!pic->irqhost) { |
218 | pr_err("%s: Could not alloc host.\n", np->full_name); | 218 | pr_err("%pOF: Could not alloc host.\n", np); |
219 | goto error_free; | 219 | goto error_free; |
220 | } | 220 | } |
221 | 221 | ||
@@ -225,7 +225,7 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) | |||
225 | 225 | ||
226 | pic->regs = of_iomap(np, 0); | 226 | pic->regs = of_iomap(np, 0); |
227 | if (!pic->regs) { | 227 | if (!pic->regs) { |
228 | pr_err("%s: Could not map registers.\n", np->full_name); | 228 | pr_err("%pOF: Could not map registers.\n", np); |
229 | goto error_free; | 229 | goto error_free; |
230 | } | 230 | } |
231 | 231 | ||
@@ -253,8 +253,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) | |||
253 | 253 | ||
254 | irq_data = irq_get_irq_data(irq); | 254 | irq_data = irq_get_irq_data(irq); |
255 | if (!irq_data) { | 255 | if (!irq_data) { |
256 | pr_err("%s: combiner-%d no irq_data for virq %d!\n", | 256 | pr_err("%pOF: combiner-%d no irq_data for virq %d!\n", |
257 | np->full_name, i, irq); | 257 | np, i, irq); |
258 | continue; | 258 | continue; |
259 | } | 259 | } |
260 | 260 | ||
@@ -265,16 +265,16 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) | |||
265 | * of the core priority interrupts (4 - 15). | 265 | * of the core priority interrupts (4 - 15). |
266 | */ | 266 | */ |
267 | if (hwirq < 4 || hwirq >= NR_PRIORITY_IRQS) { | 267 | if (hwirq < 4 || hwirq >= NR_PRIORITY_IRQS) { |
268 | pr_err("%s: combiner-%d core irq %ld out of range!\n", | 268 | pr_err("%pOF: combiner-%d core irq %ld out of range!\n", |
269 | np->full_name, i, hwirq); | 269 | np, i, hwirq); |
270 | continue; | 270 | continue; |
271 | } | 271 | } |
272 | 272 | ||
273 | /* record the mapping */ | 273 | /* record the mapping */ |
274 | mapping[hwirq - 4] = i; | 274 | mapping[hwirq - 4] = i; |
275 | 275 | ||
276 | pr_debug("%s: combiner-%d cascading to hwirq %ld\n", | 276 | pr_debug("%pOF: combiner-%d cascading to hwirq %ld\n", |
277 | np->full_name, i, hwirq); | 277 | np, i, hwirq); |
278 | 278 | ||
279 | cascade_data[i].pic = pic; | 279 | cascade_data[i].pic = pic; |
280 | cascade_data[i].index = i; | 280 | cascade_data[i].index = i; |
@@ -290,8 +290,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) | |||
290 | /* Finally, set up the MUX registers */ | 290 | /* Finally, set up the MUX registers */ |
291 | for (i = 0; i < NR_MUX_OUTPUTS; i++) { | 291 | for (i = 0; i < NR_MUX_OUTPUTS; i++) { |
292 | if (mapping[i] != IRQ_UNMAPPED) { | 292 | if (mapping[i] != IRQ_UNMAPPED) { |
293 | pr_debug("%s: setting mux %d to priority %d\n", | 293 | pr_debug("%pOF: setting mux %d to priority %d\n", |
294 | np->full_name, mapping[i], i + 4); | 294 | np, mapping[i], i + 4); |
295 | set_megamod_mux(pic, mapping[i], i); | 295 | set_megamod_mux(pic, mapping[i], i); |
296 | } | 296 | } |
297 | } | 297 | } |
diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c index 755359eb6286..e8b6cc6a7b5a 100644 --- a/arch/c6x/platforms/plldata.c +++ b/arch/c6x/platforms/plldata.c | |||
@@ -436,8 +436,8 @@ void __init c64x_setup_clocks(void) | |||
436 | 436 | ||
437 | err = of_property_read_u32(node, "clock-frequency", &val); | 437 | err = of_property_read_u32(node, "clock-frequency", &val); |
438 | if (err || val == 0) { | 438 | if (err || val == 0) { |
439 | pr_err("%s: no clock-frequency found! Using %dMHz\n", | 439 | pr_err("%pOF: no clock-frequency found! Using %dMHz\n", |
440 | node->full_name, (int)val / 1000000); | 440 | node, (int)val / 1000000); |
441 | val = 25000000; | 441 | val = 25000000; |
442 | } | 442 | } |
443 | clkin1.rate = val; | 443 | clkin1.rate = val; |
diff --git a/arch/c6x/platforms/timer64.c b/arch/c6x/platforms/timer64.c index 0bd0452ded80..241a9a607193 100644 --- a/arch/c6x/platforms/timer64.c +++ b/arch/c6x/platforms/timer64.c | |||
@@ -204,14 +204,14 @@ void __init timer64_init(void) | |||
204 | 204 | ||
205 | timer = of_iomap(np, 0); | 205 | timer = of_iomap(np, 0); |
206 | if (!timer) { | 206 | if (!timer) { |
207 | pr_debug("%s: Cannot map timer registers.\n", np->full_name); | 207 | pr_debug("%pOF: Cannot map timer registers.\n", np); |
208 | goto out; | 208 | goto out; |
209 | } | 209 | } |
210 | pr_debug("%s: Timer registers=%p.\n", np->full_name, timer); | 210 | pr_debug("%pOF: Timer registers=%p.\n", np, timer); |
211 | 211 | ||
212 | cd->irq = irq_of_parse_and_map(np, 0); | 212 | cd->irq = irq_of_parse_and_map(np, 0); |
213 | if (cd->irq == NO_IRQ) { | 213 | if (cd->irq == NO_IRQ) { |
214 | pr_debug("%s: Cannot find interrupt.\n", np->full_name); | 214 | pr_debug("%pOF: Cannot find interrupt.\n", np); |
215 | iounmap(timer); | 215 | iounmap(timer); |
216 | goto out; | 216 | goto out; |
217 | } | 217 | } |
@@ -229,7 +229,7 @@ void __init timer64_init(void) | |||
229 | dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED); | 229 | dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED); |
230 | } | 230 | } |
231 | 231 | ||
232 | pr_debug("%s: Timer irq=%d.\n", np->full_name, cd->irq); | 232 | pr_debug("%pOF: Timer irq=%d.\n", np, cd->irq); |
233 | 233 | ||
234 | clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5); | 234 | clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5); |
235 | 235 | ||