UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andrey Danin <danindrey@mail.ru>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2015-07-17 12:50:06 +02:00 committed by Wolfram Sang
parent 66be6056eb
commit c4019b7040
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/i2c/i2c-core.c
View File

@ -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 /* This is a permissive address validity check, I2C address map constraints
* are purposely not enforced, except for the general call address. */ * 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 */ /* 10-bit address, all values are valid */
if (client->addr > 0x3ff) if (addr > 0x3ff)
return -EINVAL; return -EINVAL;
} else { } else {
/* 7-bit address, reject the general call address */ /* 7-bit address, reject the general call address */
if (client->addr == 0x00 || client->addr > 0x7f) if (addr == 0x00 || addr > 0x7f)
return -EINVAL; return -EINVAL;
} }
return 0; 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)); strlcpy(client->name, info->type, sizeof(client->name));
/* Check for address validity */ status = i2c_check_addr_validity(client->addr, client->flags);
status = i2c_check_addr_validity(client);
if (status) { if (status) {
dev_err(&adap->dev, "Invalid %d-bit I2C address 0x%02hx\n", dev_err(&adap->dev, "Invalid %d-bit I2C address 0x%02hx\n",
client->flags & I2C_CLIENT_TEN ? 10 : 7, client->addr); client->flags & I2C_CLIENT_TEN ? 10 : 7, client->addr);