diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:43:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-20 15:37:10 -0400 |
commit | 8cd3ec51c0c329e996cb5b366355524eab694cd2 (patch) | |
tree | e1f7aad8ae8d8de4c2f8f54189b69fc0d9c35445 | |
parent | 45fc0113ccee2352ec470a48687c906edc37eca3 (diff) |
sbus: 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: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/sbus/char/display7seg.c | 4 | ||||
-rw-r--r-- | drivers/sbus/char/flash.c | 4 | ||||
-rw-r--r-- | drivers/sbus/char/uctrl.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 04efed171c88..f32765d3cbd8 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c | |||
@@ -212,8 +212,8 @@ static int d7s_probe(struct platform_device *op) | |||
212 | 212 | ||
213 | writeb(regs, p->regs); | 213 | writeb(regs, p->regs); |
214 | 214 | ||
215 | printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n", | 215 | printk(KERN_INFO PFX "7-Segment Display%pOF at [%s:0x%llx] %s\n", |
216 | op->dev.of_node->full_name, | 216 | op->dev.of_node, |
217 | (regs & D7S_FLIP) ? " (FLIPPED)" : "", | 217 | (regs & D7S_FLIP) ? " (FLIPPED)" : "", |
218 | op->resource[0].start, | 218 | op->resource[0].start, |
219 | sol_compat ? "in sol_compat mode" : ""); | 219 | sol_compat ? "in sol_compat mode" : ""); |
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 216f923161d1..a610b8d3d11f 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
@@ -181,8 +181,8 @@ static int flash_probe(struct platform_device *op) | |||
181 | } | 181 | } |
182 | flash.busy = 0; | 182 | flash.busy = 0; |
183 | 183 | ||
184 | printk(KERN_INFO "%s: OBP Flash, RD %lx[%lx] WR %lx[%lx]\n", | 184 | printk(KERN_INFO "%pOF: OBP Flash, RD %lx[%lx] WR %lx[%lx]\n", |
185 | op->dev.of_node->full_name, | 185 | op->dev.of_node, |
186 | flash.read_base, flash.read_size, | 186 | flash.read_base, flash.read_size, |
187 | flash.write_base, flash.write_size); | 187 | flash.write_base, flash.write_size); |
188 | 188 | ||
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 57696fc0b482..0a5013350acd 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -379,8 +379,8 @@ static int uctrl_probe(struct platform_device *op) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr); | 381 | sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr); |
382 | printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n", | 382 | printk(KERN_INFO "%pOF: uctrl regs[0x%p] (irq %d)\n", |
383 | op->dev.of_node->full_name, p->regs, p->irq); | 383 | op->dev.of_node, p->regs, p->irq); |
384 | uctrl_get_event_status(p); | 384 | uctrl_get_event_status(p); |
385 | uctrl_get_external_status(p); | 385 | uctrl_get_external_status(p); |
386 | 386 | ||