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

Commit 4fad8868 authored by Boris Brezillon's avatar Boris Brezillon Committed by Wolfram Sang
Browse files

i2c: Get rid of i2c_board_info->archdata 



The only user of i2c_board_info->archdata is the OF parsing code and it
just pass a zero-initialized object which has the same effect as leaving
->archdata to NULL since the client object is allocated with kzalloc().

Get rid of this useless field.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent a80bcb5a

drivers/i2c/i2c-core-base.c

+0 −4
Original line number Diff line number Diff line
@@ -717,10 +717,6 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 
	client->adapter = adap;



	client->dev.platform_data = info->platform_data;



	if (info->archdata)

		client->dev.archdata = *info->archdata;



	client->flags = info->flags;

	client->addr = info->addr;

drivers/i2c/i2c-core-of.c

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, 
{

	struct i2c_client *client;

	struct i2c_board_info info = {};

	struct dev_archdata dev_ad = {};

	u32 addr;

	int ret;
@@ -56,7 +55,6 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, 
	}



	info.addr = addr;

	info.archdata = &dev_ad;

	info.of_node = of_node_get(node);



	if (of_property_read_bool(node, "host-notify"))

include/linux/i2c.h

+0 −2
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; } 
 * @addr: stored in i2c_client.addr

 * @dev_name: Overrides the default <busnr>-<addr> dev_name if set

 * @platform_data: stored in i2c_client.dev.platform_data

 * @archdata: copied into i2c_client.dev.archdata

 * @of_node: pointer to OpenFirmware device node

 * @fwnode: device node supplied by the platform firmware

 * @properties: additional device properties for the device
@@ -419,7 +418,6 @@ struct i2c_board_info { 
	unsigned short	addr;

	const char	*dev_name;

	void		*platform_data;

	struct dev_archdata	*archdata;

	struct device_node *of_node;

	struct fwnode_handle *fwnode;

	const struct property_entry *properties;