GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: rename address check functions

Browse source 
The current naming is based on the arguments of the functions and not on
what they do. Even I as the maintainer find this confusing, so let's
rename them to something more descriptive.

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:43:22 +02:00 • committed by Wolfram Sang
parent da899f55b3
commit 66be6056eb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/i2c/i2c-core.c
View file

@ -798,7 +798,7 @@ 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_client_addr_validity(const struct i2c_client *client) static int i2c_check_addr_validity(const struct i2c_client *client)
{ {
if (client->flags & I2C_CLIENT_TEN) { if (client->flags & I2C_CLIENT_TEN) {
/* 10-bit address, all values are valid */ /* 10-bit address, all values are valid */
@ -816,7 +816,7 @@ static int i2c_check_client_addr_validity(const struct i2c_client *client)
* device uses a reserved address, then it shouldn't be probed. 7-bit * device uses a reserved address, then it shouldn't be probed. 7-bit
* addressing is assumed, 10-bit address devices are rare and should be * addressing is assumed, 10-bit address devices are rare and should be
* explicitly enumerated. */ * explicitly enumerated. */
static int i2c_check_addr_validity(unsigned short addr) static int i2c_check_7bit_addr_validity_strict(unsigned short addr)
{ {
/* /*
* Reserved addresses per I2C specification: * Reserved addresses per I2C specification:
@ -985,7 +985,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 */ /* Check for address validity */
status = i2c_check_client_addr_validity(client); 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);
@ -2296,7 +2296,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
int err; int err;
/* Make sure the address is valid */ /* Make sure the address is valid */
err = i2c_check_addr_validity(addr); err = i2c_check_7bit_addr_validity_strict(addr);
if (err) { if (err) {
dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n", dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
addr); addr);
@ -2413,7 +2413,7 @@ i2c_new_probed_device(struct i2c_adapter *adap,
for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) { for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) {
/* Check address validity */ /* Check address validity */
if (i2c_check_addr_validity(addr_list[i]) < 0) { if (i2c_check_7bit_addr_validity_strict(addr_list[i]) < 0) {
dev_warn(&adap->dev, "Invalid 7-bit address " dev_warn(&adap->dev, "Invalid 7-bit address "
"0x%02x\n", addr_list[i]); "0x%02x\n", addr_list[i]);
continue; continue;
@ -2997,7 +2997,7 @@ int i2c_slave_register(struct i2c_client *client, i2c_slave_cb_t slave_cb)
if (!(client->flags & I2C_CLIENT_TEN)) { if (!(client->flags & I2C_CLIENT_TEN)) {
/* Enforce stricter address checking */ /* Enforce stricter address checking */
ret = i2c_check_addr_validity(client->addr); ret = i2c_check_7bit_addr_validity_strict(client->addr);
if (ret) { if (ret) {
dev_err(&client->dev, "%s: invalid address\n", __func__); dev_err(&client->dev, "%s: invalid address\n", __func__);
return ret; return ret;