Commit 22fe5670 authored by Rob Herring's avatar Rob Herring Committed by Martin K. Petersen

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: default avatarRob 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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c1e7194d
...@@ -448,15 +448,14 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat ...@@ -448,15 +448,14 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
ioremap(macio_resource_start(mdev, 1), 0x1000); ioremap(macio_resource_start(mdev, 1), 0x1000);
state->dmaintr = macio_irq(mdev, 1); state->dmaintr = macio_irq(mdev, 1);
if (state->regs == NULL || state->dma == NULL) { if (state->regs == NULL || state->dma == NULL) {
printk(KERN_ERR "mac53c94: ioremap failed for %s\n", printk(KERN_ERR "mac53c94: ioremap failed for %pOF\n", node);
node->full_name);
goto out_free; goto out_free;
} }
clkprop = of_get_property(node, "clock-frequency", &proplen); clkprop = of_get_property(node, "clock-frequency", &proplen);
if (clkprop == NULL || proplen != sizeof(int)) { if (clkprop == NULL || proplen != sizeof(int)) {
printk(KERN_ERR "%s: can't get clock frequency, " printk(KERN_ERR "%pOF: can't get clock frequency, "
"assuming 25MHz\n", node->full_name); "assuming 25MHz\n", node);
state->clk_freq = 25000000; state->clk_freq = 25000000;
} else } else
state->clk_freq = *(int *)clkprop; state->clk_freq = *(int *)clkprop;
...@@ -469,7 +468,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat ...@@ -469,7 +468,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
sizeof(struct dbdma_cmd), GFP_KERNEL); sizeof(struct dbdma_cmd), GFP_KERNEL);
if (dma_cmd_space == 0) { if (dma_cmd_space == 0) {
printk(KERN_ERR "mac53c94: couldn't allocate dma " printk(KERN_ERR "mac53c94: couldn't allocate dma "
"command space for %s\n", node->full_name); "command space for %pOF\n", node);
rc = -ENOMEM; rc = -ENOMEM;
goto out_free; goto out_free;
} }
...@@ -481,8 +480,8 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat ...@@ -481,8 +480,8 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
mac53c94_init(state); mac53c94_init(state);
if (request_irq(state->intr, do_mac53c94_interrupt, 0, "53C94",state)) { if (request_irq(state->intr, do_mac53c94_interrupt, 0, "53C94",state)) {
printk(KERN_ERR "mac53C94: can't get irq %d for %s\n", printk(KERN_ERR "mac53C94: can't get irq %d for %pOF\n",
state->intr, node->full_name); state->intr, node);
goto out_free_dma; goto out_free_dma;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment