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

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

macintosh: 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>
[mpe: Also convert the two cases inside #if 0]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 859420e3

drivers/macintosh/macio_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static ssize_t devspec_show(struct device *dev, 
	struct platform_device *ofdev;



	ofdev = to_platform_device(dev);

	return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);

	return sprintf(buf, "%pOF\n", ofdev->dev.of_node);

}

static DEVICE_ATTR_RO(modalias);

static DEVICE_ATTR_RO(devspec);

drivers/macintosh/rack-meter.c

+6 −6
Original line number Diff line number Diff line
@@ -411,16 +411,16 @@ static int rackmeter_probe(struct macio_dev* mdev, 
#if 0 /* Use that when i2s-a is finally an mdev per-se */

	if (macio_resource_count(mdev) < 2 || macio_irq_count(mdev) < 2) {

		printk(KERN_ERR

		       "rackmeter: found match but lacks resources: %s"

		       "rackmeter: found match but lacks resources: %pOF"

		       " (%d resources, %d interrupts)\n",

		       mdev->ofdev.node->full_name);

		       mdev->ofdev.dev.of_node);

		rc = -ENXIO;

		goto bail_free;

	}

	if (macio_request_resources(mdev, "rackmeter")) {

		printk(KERN_ERR

		       "rackmeter: failed to request resources: %s\n",

		       mdev->ofdev.node->full_name);

		       "rackmeter: failed to request resources: %pOF\n",

		       mdev->ofdev.dev.of_node);

		rc = -EBUSY;

		goto bail_free;

	}
@@ -431,8 +431,8 @@ static int rackmeter_probe(struct macio_dev* mdev, 
	    of_address_to_resource(i2s, 0, &ri2s) ||

	    of_address_to_resource(i2s, 1, &rdma)) {

		printk(KERN_ERR

		       "rackmeter: found match but lacks resources: %s",

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

		       "rackmeter: found match but lacks resources: %pOF",

		       mdev->ofdev.dev.of_node);

		rc = -ENXIO;

		goto bail_free;

	}

drivers/macintosh/smu.c

+4 −4
Original line number Diff line number Diff line
@@ -589,14 +589,14 @@ static int smu_late_init(void) 
	if (smu->db_node) {

		smu->db_irq = irq_of_parse_and_map(smu->db_node, 0);

		if (!smu->db_irq)

			printk(KERN_ERR "smu: failed to map irq for node %s\n",

			       smu->db_node->full_name);

			printk(KERN_ERR "smu: failed to map irq for node %pOF\n",

			       smu->db_node);

	}

	if (smu->msg_node) {

		smu->msg_irq = irq_of_parse_and_map(smu->msg_node, 0);

		if (!smu->msg_irq)

			printk(KERN_ERR "smu: failed to map irq for node %s\n",

			       smu->msg_node->full_name);

			printk(KERN_ERR "smu: failed to map irq for node %pOF\n",

			       smu->msg_node);

	}



	/*

drivers/macintosh/via-cuda.c

+2 −2
Original line number Diff line number Diff line
@@ -297,8 +297,8 @@ static int __init via_cuda_start(void) 
#else

    cuda_irq = irq_of_parse_and_map(vias, 0);

    if (!cuda_irq) {

	printk(KERN_ERR "via-cuda: can't map interrupts for %s\n",

	       vias->full_name);

	printk(KERN_ERR "via-cuda: can't map interrupts for %pOF\n",

	       vias);

	return -ENODEV;

    }

#endif

drivers/macintosh/windfarm_fcu_controls.c

+2 −2
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv) 
				id = ((*reg) - 0x30) / 2;

			if (id > 7) {

				pr_warning("wf_fcu: Can't parse "

				       "fan ID in device-tree for %s\n",

					   np->full_name);

				       "fan ID in device-tree for %pOF\n",

					   np);

				break;

			}

			wf_fcu_add_fan(pv, name, type, id);