Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859420e3 authored by Rob Herring's avatar Rob Herring Committed by Michael Ellerman
Browse files

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: default avatarRob 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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b0d6c9ba

drivers/ide/pmac.c

+9 −9
Original line number Diff line number Diff line
@@ -1145,8 +1145,8 @@ static int pmac_ide_macio_attach(struct macio_dev *mdev, 
		return -ENOMEM;



	if (macio_resource_count(mdev) == 0) {

		printk(KERN_WARNING "ide-pmac: no address for %s\n",

				    mdev->ofdev.dev.of_node->full_name);

		printk(KERN_WARNING "ide-pmac: no address for %pOF\n",

				    mdev->ofdev.dev.of_node);

		rc = -ENXIO;

		goto out_free_pmif;

	}
@@ -1154,7 +1154,7 @@ static int pmac_ide_macio_attach(struct macio_dev *mdev, 
	/* Request memory resource for IO ports */

	if (macio_request_resource(mdev, 0, "ide-pmac (ports)")) {

		printk(KERN_ERR "ide-pmac: can't request MMIO resource for "

				"%s!\n", mdev->ofdev.dev.of_node->full_name);

				"%pOF!\n", mdev->ofdev.dev.of_node);

		rc = -EBUSY;

		goto out_free_pmif;

	}
@@ -1165,8 +1165,8 @@ static int pmac_ide_macio_attach(struct macio_dev *mdev, 
	 * where that happens though...

	 */

	if (macio_irq_count(mdev) == 0) {

		printk(KERN_WARNING "ide-pmac: no intrs for device %s, using "

				    "13\n", mdev->ofdev.dev.of_node->full_name);

		printk(KERN_WARNING "ide-pmac: no intrs for device %pOF, using "

				    "13\n", mdev->ofdev.dev.of_node);

		irq = irq_create_mapping(NULL, 13);

	} else

		irq = macio_irq(mdev, 0);
@@ -1183,8 +1183,8 @@ static int pmac_ide_macio_attach(struct macio_dev *mdev, 
	if (macio_resource_count(mdev) >= 2) {

		if (macio_request_resource(mdev, 1, "ide-pmac (dma)"))

			printk(KERN_WARNING "ide-pmac: can't request DMA "

					    "resource for %s!\n",

					    mdev->ofdev.dev.of_node->full_name);

					    "resource for %pOF!\n",

					    mdev->ofdev.dev.of_node);

		else

			pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);

	} else
@@ -1274,7 +1274,7 @@ static int pmac_ide_pci_attach(struct pci_dev *pdev, 


	if (pci_enable_device(pdev)) {

		printk(KERN_WARNING "ide-pmac: Can't enable PCI device for "

				    "%s\n", np->full_name);

				    "%pOF\n", np);

		rc = -ENXIO;

		goto out_free_pmif;

	}
@@ -1282,7 +1282,7 @@ static int pmac_ide_pci_attach(struct pci_dev *pdev, 
			

	if (pci_request_regions(pdev, "Kauai ATA")) {

		printk(KERN_ERR "ide-pmac: Cannot obtain PCI resources for "

				"%s\n", np->full_name);

				"%pOF\n", np);

		rc = -ENXIO;

		goto out_free_pmif;

	}