of: Convert to using %pOF instead of full_name (0d638a07) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/of/address.c

+10 −11

Original line number	Diff line number	Diff line
		@@ -559,7 +559,7 @@ static u64 __of_translate_address(struct device_node *dev,
		int na, ns, pna, pns;
		u64 result = OF_BAD_ADDR;

		pr_debug(" translation for device %s \n", of_node_full_name(dev));
		pr_debug(" translation for device %pOF \n", dev);

		/* Increase refcount at current level */
		of_node_get(dev);
		@@ -573,13 +573,13 @@ static u64 __of_translate_address(struct device_node *dev,
		/* Count address cells & copy address locally */
		bus->count_cells(dev, &na, &ns);
		if (!OF_CHECK_COUNTS(na, ns)) {
		pr_debug("Bad cell count for %s\n", of_node_full_name(dev));
		pr_debug("Bad cell count for %pOF\n", dev);
		goto bail;
		}
		memcpy(addr, in_addr, na * 4);

		pr_debug("bus is %s (na=%d, ns=%d) on %s\n",
		bus->name, na, ns, of_node_full_name(parent));
		pr_debug("bus is %s (na=%d, ns=%d) on %pOF\n",
		bus->name, na, ns, parent);
		of_dump_addr("translating address:", addr, na);

		/* Translate */
		@@ -600,13 +600,12 @@ static u64 __of_translate_address(struct device_node *dev,
		pbus = of_match_bus(parent);
		pbus->count_cells(dev, &pna, &pns);
		if (!OF_CHECK_COUNTS(pna, pns)) {
		pr_err("Bad cell count for %s\n",
		of_node_full_name(dev));
		pr_err("Bad cell count for %pOF\n", dev);
		break;
		}

		pr_debug("parent bus is %s (na=%d, ns=%d) on %s\n",
		pbus->name, pna, pns, of_node_full_name(parent));
		pr_debug("parent bus is %s (na=%d, ns=%d) on %pOF\n",
		pbus->name, pna, pns, parent);

		/* Apply bus translation */
		if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop))
		@@ -855,7 +854,7 @@ int of_dma_get_range(struct device_node np, u64 dma_addr, u64 paddr, u64 siz
		}

		if (!ranges) {
		pr_debug("no dma-ranges found for node(%s)\n", np->full_name);
		pr_debug("no dma-ranges found for node(%pOF)\n", np);
		ret = -ENODEV;
		goto out;
		}
		@@ -872,8 +871,8 @@ int of_dma_get_range(struct device_node np, u64 dma_addr, u64 paddr, u64 siz
		dmaaddr = of_read_number(ranges, naddr);
		*paddr = of_translate_dma_address(np, ranges);
		if (*paddr == OF_BAD_ADDR) {
		pr_err("translation of DMA address(%pad) to CPU address failed node(%s)\n",
		dma_addr, np->full_name);
		pr_err("translation of DMA address(%pad) to CPU address failed node(%pOF)\n",
		dma_addr, np);
		ret = -EINVAL;
		goto out;
		}

drivers/of/base.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ int __of_add_property_sysfs(struct device_node np, struct property pp)
		pp->attr.read = of_node_property_read;

		rc = sysfs_create_bin_file(&np->kobj, &pp->attr);
		WARN(rc, "error adding attribute %s to node %s\n", pp->name, np->full_name);
		WARN(rc, "error adding attribute %s to node %pOF\n", pp->name, np);
		return rc;
		}

		@@ -1122,7 +1122,7 @@ EXPORT_SYMBOL(of_find_node_by_phandle);
		void of_print_phandle_args(const char msg, const struct of_phandle_args args)
		{
		int i;
		printk("%s %s", msg, of_node_full_name(args->np));
		printk("%s %pOF", msg, args->np);
		for (i = 0; i < args->args_count; i++) {
		const char delim = i ? ',' : ':';

		@@ -1184,17 +1184,17 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)

		if (it->cells_name) {
		if (!it->node) {
		pr_err("%s: could not find phandle\n",
		it->parent->full_name);
		pr_err("%pOF: could not find phandle\n",
		it->parent);
		goto err;
		}

		if (of_property_read_u32(it->node, it->cells_name,
		&count)) {
		pr_err("%s: could not get %s for %s\n",
		it->parent->full_name,
		pr_err("%pOF: could not get %s for %pOF\n",
		it->parent,
		it->cells_name,
		it->node->full_name);
		it->node);
		goto err;
		}
		} else {
		@@ -1206,8 +1206,8 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)
		* property data length
		*/
		if (it->cur + count > it->list_end) {
		pr_err("%s: arguments longer than property\n",
		it->parent->full_name);
		pr_err("%pOF: arguments longer than property\n",
		it->parent);
		goto err;
		}
		}
		@@ -1639,8 +1639,8 @@ static void of_alias_add(struct alias_prop ap, struct device_node np,
		strncpy(ap->stem, stem, stem_len);
		ap->stem[stem_len] = 0;
		list_add_tail(&ap->link, &aliases_lookup);
		pr_debug("adding DT alias:%s: stem=%s id=%i node=%s\n",
		ap->alias, ap->stem, ap->id, of_node_full_name(np));
		pr_debug("adding DT alias:%s: stem=%s id=%i node=%pOF\n",
		ap->alias, ap->stem, ap->id, np);
		}

		/**

drivers/of/device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ void of_device_uevent(struct device dev, struct kobj_uevent_env env)
		return;

		add_uevent_var(env, "OF_NAME=%s", dev->of_node->name);
		add_uevent_var(env, "OF_FULLNAME=%s", dev->of_node->full_name);
		add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node);
		if (dev->of_node->type && strcmp("<NULL>", dev->of_node->type) != 0)
		add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type);

drivers/of/dynamic.c

+16 −17

Original line number	Diff line number	Diff line
		@@ -98,14 +98,14 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)
		switch (action) {
		case OF_RECONFIG_ATTACH_NODE:
		case OF_RECONFIG_DETACH_NODE:
		pr_debug("notify %-15s %s\n", action_names[action],
		pr->dn->full_name);
		pr_debug("notify %-15s %pOF\n", action_names[action],
		pr->dn);
		break;
		case OF_RECONFIG_ADD_PROPERTY:
		case OF_RECONFIG_REMOVE_PROPERTY:
		case OF_RECONFIG_UPDATE_PROPERTY:
		pr_debug("notify %-15s %s:%s\n", action_names[action],
		pr->dn->full_name, pr->prop->name);
		pr_debug("notify %-15s %pOF:%s\n", action_names[action],
		pr->dn, pr->prop->name);
		break;

		}
		@@ -328,11 +328,10 @@ void of_node_release(struct kobject *kobj)

		/* We should never be releasing nodes that haven't been detached. */
		if (!of_node_check_flag(node, OF_DETACHED)) {
		pr_err("ERROR: Bad of_node_put() on %s\n", node->full_name);
		pr_err("ERROR: Bad of_node_put() on %pOF\n", node);
		dump_stack();
		return;
		}

		if (!of_node_check_flag(node, OF_DYNAMIC))
		return;

		@@ -462,13 +461,13 @@ static void __of_changeset_entry_dump(struct of_changeset_entry *ce)
		case OF_RECONFIG_ADD_PROPERTY:
		case OF_RECONFIG_REMOVE_PROPERTY:
		case OF_RECONFIG_UPDATE_PROPERTY:
		pr_debug("cset<%p> %-15s %s/%s\n", ce, action_names[ce->action],
		ce->np->full_name, ce->prop->name);
		pr_debug("cset<%p> %-15s %pOF/%s\n", ce, action_names[ce->action],
		ce->np, ce->prop->name);
		break;
		case OF_RECONFIG_ATTACH_NODE:
		case OF_RECONFIG_DETACH_NODE:
		pr_debug("cset<%p> %-15s %s\n", ce, action_names[ce->action],
		ce->np->full_name);
		pr_debug("cset<%p> %-15s %pOF\n", ce, action_names[ce->action],
		ce->np);
		break;
		}
		}
		@@ -539,7 +538,7 @@ static void __of_changeset_entry_notify(struct of_changeset_entry *ce, bool reve
		}

		if (ret)
		pr_err("changeset notifier error @%s\n", ce->np->full_name);
		pr_err("changeset notifier error @%pOF\n", ce->np);
		}

		static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
		@@ -570,8 +569,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)

		ret = __of_add_property(ce->np, ce->prop);
		if (ret) {
		pr_err("changeset: add_property failed @%s/%s\n",
		ce->np->full_name,
		pr_err("changeset: add_property failed @%pOF/%s\n",
		ce->np,
		ce->prop->name);
		break;
		}
		@@ -579,8 +578,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
		case OF_RECONFIG_REMOVE_PROPERTY:
		ret = __of_remove_property(ce->np, ce->prop);
		if (ret) {
		pr_err("changeset: remove_property failed @%s/%s\n",
		ce->np->full_name,
		pr_err("changeset: remove_property failed @%pOF/%s\n",
		ce->np,
		ce->prop->name);
		break;
		}
		@@ -598,8 +597,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)

		ret = __of_update_property(ce->np, ce->prop, &old_prop);
		if (ret) {
		pr_err("changeset: update_property failed @%s/%s\n",
		ce->np->full_name,
		pr_err("changeset: update_property failed @%pOF/%s\n",
		ce->np,
		ce->prop->name);
		break;
		}

drivers/of/irq.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ int of_irq_parse_raw(const __be32 addr, struct of_phandle_args out_irq)
		goto fail;
		}

		pr_debug("of_irq_parse_raw: ipar=%s, size=%d\n", of_node_full_name(ipar), intsize);
		pr_debug("of_irq_parse_raw: ipar=%pOF, size=%d\n", ipar, intsize);

		if (out_irq->args_count != intsize)
		goto fail;
		@@ -269,7 +269,7 @@ int of_irq_parse_raw(const __be32 addr, struct of_phandle_args out_irq)
		skiplevel:
		/* Iterate again with new parent */
		out_irq->np = newpar;
		pr_debug(" -> new parent: %s\n", of_node_full_name(newpar));
		pr_debug(" -> new parent: %pOF\n", newpar);
		of_node_put(ipar);
		ipar = newpar;
		newpar = NULL;
		@@ -301,7 +301,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
		u32 intsize, intlen;
		int i, res;

		pr_debug("of_irq_parse_one: dev=%s, index=%d\n", of_node_full_name(device), index);
		pr_debug("of_irq_parse_one: dev=%pOF, index=%d\n", device, index);

		/* OldWorld mac stuff is "special", handle out of line */
		if (of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)
		@@ -555,8 +555,8 @@ void __init of_irq_init(const struct of_device_id *matches)

		of_node_set_flag(desc->dev, OF_POPULATED);

		pr_debug("of_irq_init: init %s (%p), parent %p\n",
		desc->dev->full_name,
		pr_debug("of_irq_init: init %pOF (%p), parent %p\n",
		desc->dev,
		desc->dev, desc->interrupt_parent);
		ret = desc->irq_init_cb(desc->dev,
		desc->interrupt_parent);