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

Commit a430a345 authored by Pantelis Antoniou's avatar Pantelis Antoniou Committed by Grant Likely
Browse files

i2c/of: Factor out Devicetree registration code 



Dynamically inserting i2c client device nodes requires the use
of a single device registration method. Factor out the loop body of
of_i2c_register_devices() so that it can be called for individual
device_nodes instead of for all the children of a node.

Note: The diff of this commit looks far more complicated than it
actually is due the indentation being changed for a large block of code.
When viewed using the diff -w flag to ignore whitespace changes it can
be seen that the change is actually quite simple.

Signed-off-by: default avatarPantelis Antoniou <pantelis.antoniou@konsulko.com>
[grant.likely: Made new function static and removed changes to header]
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Reviewed-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-i2c@vger.kernel.org
parent 177d271c

drivers/i2c/i2c-core.c

+52 −45
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/acpi.h>

#include <linux/jump_label.h>

#include <asm/uaccess.h>

#include <linux/err.h>



#include "i2c-core.h"
@@ -1368,18 +1369,10 @@ static void i2c_scan_static_board_info(struct i2c_adapter *adapter) 
/* OF support code */



#if IS_ENABLED(CONFIG_OF)

static void of_i2c_register_devices(struct i2c_adapter *adap)

static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,

						 struct device_node *node)

{

	void *result;

	struct device_node *node;



	/* Only register child devices if the adapter has a node pointer set */

	if (!adap->dev.of_node)

		return;



	dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");



	for_each_available_child_of_node(adap->dev.of_node, node) {

	struct i2c_client *result;

	struct i2c_board_info info = {};

	struct dev_archdata dev_ad = {};

	const __be32 *addr;
@@ -1390,21 +1383,21 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) 
	if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {

		dev_err(&adap->dev, "of_i2c: modalias failure on %s\n",

			node->full_name);

			continue;

		return ERR_PTR(-EINVAL);

	}



	addr = of_get_property(node, "reg", &len);

	if (!addr || (len < sizeof(int))) {

		dev_err(&adap->dev, "of_i2c: invalid reg on %s\n",

			node->full_name);

			continue;

		return ERR_PTR(-EINVAL);

	}



	info.addr = be32_to_cpup(addr);

	if (info.addr > (1 << 10) - 1) {

		dev_err(&adap->dev, "of_i2c: invalid addr=%x on %s\n",

			info.addr, node->full_name);

			continue;

		return ERR_PTR(-EINVAL);

	}



	info.irq = irq_of_parse_and_map(node, 0);
@@ -1422,9 +1415,23 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) 
			node->full_name);

		of_node_put(node);

		irq_dispose_mapping(info.irq);

			continue;

		return ERR_PTR(-EINVAL);

	}

	return result;

}



static void of_i2c_register_devices(struct i2c_adapter *adap)

{

	struct device_node *node;



	/* Only register child devices if the adapter has a node pointer set */

	if (!adap->dev.of_node)

		return;



	dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");



	for_each_available_child_of_node(adap->dev.of_node, node)

		of_i2c_register_device(adap, node);

}



static int of_dev_node_match(struct device *dev, void *data)