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

Commit c4019b70 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: make address check indpendent from client struct 



We want to use this function with struct boardinfo soon, so let's just
pass the parameters really needed. We also extend the type of addr, so
more types can be input. Remove a superfluous dangling comment while
here.

Tested-by: default avatarAndrey Danin <danindrey@mail.ru>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 66be6056

drivers/i2c/i2c-core.c

+5 −6
Original line number Diff line number Diff line
@@ -798,15 +798,15 @@ static unsigned short i2c_encode_flags_to_addr(struct i2c_client *client) 


/* This is a permissive address validity check, I2C address map constraints

 * are purposely not enforced, except for the general call address. */

static int i2c_check_addr_validity(const struct i2c_client *client)

static int i2c_check_addr_validity(unsigned addr, unsigned short flags)

{

	if (client->flags & I2C_CLIENT_TEN) {

	if (flags & I2C_CLIENT_TEN) {

		/* 10-bit address, all values are valid */

		if (client->addr > 0x3ff)

		if (addr > 0x3ff)

			return -EINVAL;

	} else {

		/* 7-bit address, reject the general call address */

		if (client->addr == 0x00 || client->addr > 0x7f)

		if (addr == 0x00 || addr > 0x7f)

			return -EINVAL;

	}

	return 0;
@@ -984,8 +984,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 


	strlcpy(client->name, info->type, sizeof(client->name));



	/* Check for address validity */

	status = i2c_check_addr_validity(client);

	status = i2c_check_addr_validity(client->addr, client->flags);

	if (status) {

		dev_err(&adap->dev, "Invalid %d-bit I2C address 0x%02hx\n",

			client->flags & I2C_CLIENT_TEN ? 10 : 7, client->addr);