Commit dbc6cd1b authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron

staging: iio: tsl2x7x: simplify device id verification

This patch renames tsl2x7x_device_id() to tsl2x7x_device_id_verif(),
removes the unnecessary pointer on the id parameter, and only calls
the verification function once.
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 8d0cc090
...@@ -1285,22 +1285,22 @@ static DEVICE_ATTR_WO(in_proximity0_calibrate); ...@@ -1285,22 +1285,22 @@ static DEVICE_ATTR_WO(in_proximity0_calibrate);
static DEVICE_ATTR_RW(in_illuminance0_lux_table); static DEVICE_ATTR_RW(in_illuminance0_lux_table);
/* Use the default register values to identify the Taos device */ /* Use the default register values to identify the Taos device */
static int tsl2x7x_device_id(int *id, int target) static int tsl2x7x_device_id_verif(int id, int target)
{ {
switch (target) { switch (target) {
case tsl2571: case tsl2571:
case tsl2671: case tsl2671:
case tsl2771: case tsl2771:
return (*id & 0xf0) == TRITON_ID; return (id & 0xf0) == TRITON_ID;
case tmd2671: case tmd2671:
case tmd2771: case tmd2771:
return (*id & 0xf0) == HALIBUT_ID; return (id & 0xf0) == HALIBUT_ID;
case tsl2572: case tsl2572:
case tsl2672: case tsl2672:
case tmd2672: case tmd2672:
case tsl2772: case tsl2772:
case tmd2772: case tmd2772:
return (*id & 0xf0) == SWORDFISH_ID; return (id & 0xf0) == SWORDFISH_ID;
} }
return -EINVAL; return -EINVAL;
...@@ -1620,8 +1620,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp, ...@@ -1620,8 +1620,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((!tsl2x7x_device_id(&ret, id->driver_data)) || if (tsl2x7x_device_id_verif(ret, id->driver_data) <= 0) {
(tsl2x7x_device_id(&ret, id->driver_data) == -EINVAL)) {
dev_info(&chip->client->dev, dev_info(&chip->client->dev,
"%s: i2c device found does not match expected id\n", "%s: i2c device found does not match expected id\n",
__func__); __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment