diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:43:28 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-08-07 14:04:02 -0400 |
commit | 22fe5670ce100bc31813cffc93ed923bcd94f4cd (patch) | |
tree | 08d79c1ac03e70cdd48842c951f1165119d0cdf0 | |
parent | c1e7194d368aeedba393b8eb00f8fc4dbf273aa6 (diff) |
scsi: 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: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/mac53c94.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index a6682c508c4c..8c4d3003b68b 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c | |||
@@ -448,15 +448,14 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat | |||
448 | ioremap(macio_resource_start(mdev, 1), 0x1000); | 448 | ioremap(macio_resource_start(mdev, 1), 0x1000); |
449 | state->dmaintr = macio_irq(mdev, 1); | 449 | state->dmaintr = macio_irq(mdev, 1); |
450 | if (state->regs == NULL || state->dma == NULL) { | 450 | if (state->regs == NULL || state->dma == NULL) { |
451 | printk(KERN_ERR "mac53c94: ioremap failed for %s\n", | 451 | printk(KERN_ERR "mac53c94: ioremap failed for %pOF\n", node); |
452 | node->full_name); | ||
453 | goto out_free; | 452 | goto out_free; |
454 | } | 453 | } |
455 | 454 | ||
456 | clkprop = of_get_property(node, "clock-frequency", &proplen); | 455 | clkprop = of_get_property(node, "clock-frequency", &proplen); |
457 | if (clkprop == NULL || proplen != sizeof(int)) { | 456 | if (clkprop == NULL || proplen != sizeof(int)) { |
458 | printk(KERN_ERR "%s: can't get clock frequency, " | 457 | printk(KERN_ERR "%pOF: can't get clock frequency, " |
459 | "assuming 25MHz\n", node->full_name); | 458 | "assuming 25MHz\n", node); |
460 | state->clk_freq = 25000000; | 459 | state->clk_freq = 25000000; |
461 | } else | 460 | } else |
462 | state->clk_freq = *(int *)clkprop; | 461 | state->clk_freq = *(int *)clkprop; |
@@ -469,7 +468,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat | |||
469 | sizeof(struct dbdma_cmd), GFP_KERNEL); | 468 | sizeof(struct dbdma_cmd), GFP_KERNEL); |
470 | if (dma_cmd_space == 0) { | 469 | if (dma_cmd_space == 0) { |
471 | printk(KERN_ERR "mac53c94: couldn't allocate dma " | 470 | printk(KERN_ERR "mac53c94: couldn't allocate dma " |
472 | "command space for %s\n", node->full_name); | 471 | "command space for %pOF\n", node); |
473 | rc = -ENOMEM; | 472 | rc = -ENOMEM; |
474 | goto out_free; | 473 | goto out_free; |
475 | } | 474 | } |
@@ -481,8 +480,8 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat | |||
481 | mac53c94_init(state); | 480 | mac53c94_init(state); |
482 | 481 | ||
483 | if (request_irq(state->intr, do_mac53c94_interrupt, 0, "53C94",state)) { | 482 | if (request_irq(state->intr, do_mac53c94_interrupt, 0, "53C94",state)) { |
484 | printk(KERN_ERR "mac53C94: can't get irq %d for %s\n", | 483 | printk(KERN_ERR "mac53C94: can't get irq %d for %pOF\n", |
485 | state->intr, node->full_name); | 484 | state->intr, node); |
486 | goto out_free_dma; | 485 | goto out_free_dma; |
487 | } | 486 | } |
488 | 487 | ||