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

Commit f7ce9103 authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

net: 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e56ce516

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -2242,7 +2242,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip, 


	if (np) {

		bus->name = np->full_name;

		snprintf(bus->id, MII_BUS_ID_SIZE, "%s", np->full_name);

		snprintf(bus->id, MII_BUS_ID_SIZE, "%pOF", np);

	} else {

		bus->name = "mv88e6xxx SMI";

		snprintf(bus->id, MII_BUS_ID_SIZE, "mv88e6xxx-%d", index++);

drivers/net/ethernet/apple/mace.c

+4 −4
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	int j, rev, rc = -EBUSY;



	if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {

		printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n",

		       mace->full_name);

		printk(KERN_ERR "can't use MACE %pOF: need 3 addrs and 3 irqs\n",

		       mace);

		return -ENODEV;

	}
@@ -123,8 +123,8 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	if (addr == NULL) {

		addr = of_get_property(mace, "local-mac-address", NULL);

		if (addr == NULL) {

			printk(KERN_ERR "Can't get mac-address for MACE %s\n",

			       mace->full_name);

			printk(KERN_ERR "Can't get mac-address for MACE %pOF\n",

			       mace);

			return -ENODEV;

		}

	}

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -398,8 +398,8 @@ static struct mac_device *dpaa_mac_dev_get(struct platform_device *pdev) 


	of_dev = of_find_device_by_node(mac_node);

	if (!of_dev) {

		dev_err(dpaa_dev, "of_find_device_by_node(%s) failed\n",

			mac_node->full_name);

		dev_err(dpaa_dev, "of_find_device_by_node(%pOF) failed\n",

			mac_node);

		of_node_put(mac_node);

		return ERR_PTR(-EINVAL);

	}

drivers/net/ethernet/freescale/fec_mpc52xx.c

+2 −2
Original line number Diff line number Diff line
@@ -960,8 +960,8 @@ static int mpc52xx_fec_probe(struct platform_device *op) 


	/* We're done ! */

	platform_set_drvdata(op, ndev);

	netdev_info(ndev, "%s MAC %pM\n",

		    op->dev.of_node->full_name, ndev->dev_addr);

	netdev_info(ndev, "%pOF MAC %pM\n",

		    op->dev.of_node, ndev->dev_addr);



	return 0;

drivers/net/ethernet/freescale/fman/fman.c

+6 −6
Original line number Diff line number Diff line
@@ -1925,8 +1925,8 @@ static int fman_reset(struct fman *fman) 


		guts_regs = of_iomap(guts_node, 0);

		if (!guts_regs) {

			dev_err(fman->dev, "%s: Couldn't map %s regs\n",

				__func__, guts_node->full_name);

			dev_err(fman->dev, "%s: Couldn't map %pOF regs\n",

				__func__, guts_node);

			goto guts_regs;

		}

#define FMAN1_ALL_MACS_MASK	0xFCC00000
@@ -2780,8 +2780,8 @@ static struct fman *read_dts_node(struct platform_device *of_dev) 


	err = of_property_read_u32(fm_node, "cell-index", &val);

	if (err) {

		dev_err(&of_dev->dev, "%s: failed to read cell-index for %s\n",

			__func__, fm_node->full_name);

		dev_err(&of_dev->dev, "%s: failed to read cell-index for %pOF\n",

			__func__, fm_node);

		goto fman_node_put;

	}

	fman->dts_params.id = (u8)val;
@@ -2834,8 +2834,8 @@ static struct fman *read_dts_node(struct platform_device *of_dev) 
	err = of_property_read_u32_array(fm_node, "fsl,qman-channel-range",

					 &range[0], 2);

	if (err) {

		dev_err(&of_dev->dev, "%s: failed to read fsl,qman-channel-range for %s\n",

			__func__, fm_node->full_name);

		dev_err(&of_dev->dev, "%s: failed to read fsl,qman-channel-range for %pOF\n",

			__func__, fm_node);

		goto fman_node_put;

	}

	fman->dts_params.qman_channel_base = range[0];