|
@@ -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);
|
|
|
state->dmaintr = macio_irq(mdev, 1);
|
|
|
if (state->regs == NULL || state->dma == NULL) {
|
|
|
- printk(KERN_ERR "mac53c94: ioremap failed for %s\n",
|
|
|
- node->full_name);
|
|
|
+ printk(KERN_ERR "mac53c94: ioremap failed for %pOF\n", node);
|
|
|
goto out_free;
|
|
|
}
|
|
|
|
|
|
clkprop = of_get_property(node, "clock-frequency", &proplen);
|
|
|
if (clkprop == NULL || proplen != sizeof(int)) {
|
|
|
- printk(KERN_ERR "%s: can't get clock frequency, "
|
|
|
- "assuming 25MHz\n", node->full_name);
|
|
|
+ printk(KERN_ERR "%pOF: can't get clock frequency, "
|
|
|
+ "assuming 25MHz\n", node);
|
|
|
state->clk_freq = 25000000;
|
|
|
} else
|
|
|
state->clk_freq = *(int *)clkprop;
|
|
@@ -469,7 +468,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
|
|
|
sizeof(struct dbdma_cmd), GFP_KERNEL);
|
|
|
if (dma_cmd_space == 0) {
|
|
|
printk(KERN_ERR "mac53c94: couldn't allocate dma "
|
|
|
- "command space for %s\n", node->full_name);
|
|
|
+ "command space for %pOF\n", node);
|
|
|
rc = -ENOMEM;
|
|
|
goto out_free;
|
|
|
}
|
|
@@ -481,8 +480,8 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
|
|
|
mac53c94_init(state);
|
|
|
|
|
|
if (request_irq(state->intr, do_mac53c94_interrupt, 0, "53C94",state)) {
|
|
|
- printk(KERN_ERR "mac53C94: can't get irq %d for %s\n",
|
|
|
- state->intr, node->full_name);
|
|
|
+ printk(KERN_ERR "mac53C94: can't get irq %d for %pOF\n",
|
|
|
+ state->intr, node);
|
|
|
goto out_free_dma;
|
|
|
}
|
|
|
|