Commit 5793ddcf authored by Biju Das's avatar Biju Das Committed by Jonathan Cameron

iio: adc: ti-adc081c: Simplify probe()

Simpilfy probe() by replacing of_device_get_match_data() and id lookup for
retrieving match data by using i2c_get_match_data() by making similar
OF/I2C/ACPI match tables.
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230902162633.50546-1-biju.das.jz@bp.renesas.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 17f961a6
...@@ -154,7 +154,6 @@ static void adc081c_reg_disable(void *reg) ...@@ -154,7 +154,6 @@ static void adc081c_reg_disable(void *reg)
static int adc081c_probe(struct i2c_client *client) static int adc081c_probe(struct i2c_client *client)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct iio_dev *iio; struct iio_dev *iio;
struct adc081c *adc; struct adc081c *adc;
const struct adcxx1c_model *model; const struct adcxx1c_model *model;
...@@ -163,10 +162,7 @@ static int adc081c_probe(struct i2c_client *client) ...@@ -163,10 +162,7 @@ static int adc081c_probe(struct i2c_client *client)
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (dev_fwnode(&client->dev)) model = i2c_get_match_data(client);
model = device_get_match_data(&client->dev);
else
model = &adcxx1c_models[id->driver_data];
iio = devm_iio_device_alloc(&client->dev, sizeof(*adc)); iio = devm_iio_device_alloc(&client->dev, sizeof(*adc));
if (!iio) if (!iio)
...@@ -207,9 +203,9 @@ static int adc081c_probe(struct i2c_client *client) ...@@ -207,9 +203,9 @@ static int adc081c_probe(struct i2c_client *client)
} }
static const struct i2c_device_id adc081c_id[] = { static const struct i2c_device_id adc081c_id[] = {
{ "adc081c", ADC081C }, { "adc081c", (kernel_ulong_t)&adcxx1c_models[ADC081C] },
{ "adc101c", ADC101C }, { "adc101c", (kernel_ulong_t)&adcxx1c_models[ADC101C] },
{ "adc121c", ADC121C }, { "adc121c", (kernel_ulong_t)&adcxx1c_models[ADC121C] },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adc081c_id); MODULE_DEVICE_TABLE(i2c, adc081c_id);
......
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