Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ide: pmac: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-ide@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Rob Herring and committed by
Michael Ellerman
859420e3 b0d6c9ba

+9 -9
+9 -9
drivers/ide/pmac.c
··· 1145 1145 return -ENOMEM; 1146 1146 1147 1147 if (macio_resource_count(mdev) == 0) { 1148 - printk(KERN_WARNING "ide-pmac: no address for %s\n", 1149 - mdev->ofdev.dev.of_node->full_name); 1148 + printk(KERN_WARNING "ide-pmac: no address for %pOF\n", 1149 + mdev->ofdev.dev.of_node); 1150 1150 rc = -ENXIO; 1151 1151 goto out_free_pmif; 1152 1152 } ··· 1154 1154 /* Request memory resource for IO ports */ 1155 1155 if (macio_request_resource(mdev, 0, "ide-pmac (ports)")) { 1156 1156 printk(KERN_ERR "ide-pmac: can't request MMIO resource for " 1157 - "%s!\n", mdev->ofdev.dev.of_node->full_name); 1157 + "%pOF!\n", mdev->ofdev.dev.of_node); 1158 1158 rc = -EBUSY; 1159 1159 goto out_free_pmif; 1160 1160 } ··· 1165 1165 * where that happens though... 1166 1166 */ 1167 1167 if (macio_irq_count(mdev) == 0) { 1168 - printk(KERN_WARNING "ide-pmac: no intrs for device %s, using " 1169 - "13\n", mdev->ofdev.dev.of_node->full_name); 1168 + printk(KERN_WARNING "ide-pmac: no intrs for device %pOF, using " 1169 + "13\n", mdev->ofdev.dev.of_node); 1170 1170 irq = irq_create_mapping(NULL, 13); 1171 1171 } else 1172 1172 irq = macio_irq(mdev, 0); ··· 1183 1183 if (macio_resource_count(mdev) >= 2) { 1184 1184 if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) 1185 1185 printk(KERN_WARNING "ide-pmac: can't request DMA " 1186 - "resource for %s!\n", 1187 - mdev->ofdev.dev.of_node->full_name); 1186 + "resource for %pOF!\n", 1187 + mdev->ofdev.dev.of_node); 1188 1188 else 1189 1189 pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); 1190 1190 } else ··· 1274 1274 1275 1275 if (pci_enable_device(pdev)) { 1276 1276 printk(KERN_WARNING "ide-pmac: Can't enable PCI device for " 1277 - "%s\n", np->full_name); 1277 + "%pOF\n", np); 1278 1278 rc = -ENXIO; 1279 1279 goto out_free_pmif; 1280 1280 } ··· 1282 1282 1283 1283 if (pci_request_regions(pdev, "Kauai ATA")) { 1284 1284 printk(KERN_ERR "ide-pmac: Cannot obtain PCI resources for " 1285 - "%s\n", np->full_name); 1285 + "%pOF\n", np); 1286 1286 rc = -ENXIO; 1287 1287 goto out_free_pmif; 1288 1288 }