| Message ID | 20230812161154.196555-1-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | iio: temperature: tmp117: Convert enum->pointer for data in the match tables | expand |
On Sat, 12 Aug 2023 17:11:54 +0100 Biju Das <biju.das.jz@bp.renesas.com> wrote: > Convert enum->pointer for data in the match tables, so that > device_get_match_data() can do match against OF/ACPI/I2C tables, once i2c > bus type match support added to it. > > Add struct tmp11x_info and replace enum->struct *tmp11x_info for data in > the match table. Drop tmp117_identify() and simplify tmp117_probe() by > replacing device_get_match_data() and id lookup for retrieving data by > i2c_get_match_data(). > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> +CC Marco who has been active on this driver recently. I'll apply it in the meantime, but still very much open to review comments. Jonathan > --- > drivers/iio/temperature/tmp117.c | 94 +++++++++++++++----------------- > 1 file changed, 44 insertions(+), 50 deletions(-) > > diff --git a/drivers/iio/temperature/tmp117.c b/drivers/iio/temperature/tmp117.c > index fc02f491688b..059953015ae7 100644 > --- a/drivers/iio/temperature/tmp117.c > +++ b/drivers/iio/temperature/tmp117.c > @@ -42,6 +42,12 @@ struct tmp117_data { > s16 calibbias; > }; > > +struct tmp11x_info { > + const char *name; > + struct iio_chan_spec const *channels; > + int num_channels; > +}; > + > static int tmp117_read_raw(struct iio_dev *indio_dev, > struct iio_chan_spec const *channel, int *val, > int *val2, long mask) > @@ -119,57 +125,54 @@ static const struct iio_chan_spec tmp116_channels[] = { > }, > }; > > +static const struct tmp11x_info tmp116_channels_info = { > + .name = "tmp116", > + .channels = tmp116_channels, > + .num_channels = ARRAY_SIZE(tmp116_channels) > +}; > + > +static const struct tmp11x_info tmp117_channels_info = { > + .name = "tmp117", > + .channels = tmp117_channels, > + .num_channels = ARRAY_SIZE(tmp117_channels) > +}; > + > static const struct iio_info tmp117_info = { > .read_raw = tmp117_read_raw, > .write_raw = tmp117_write_raw, > }; > > -static int tmp117_identify(struct i2c_client *client) > +static int tmp117_probe(struct i2c_client *client) > { > - const struct i2c_device_id *id; > - unsigned long match_data; > + const struct tmp11x_info *match_data; > + struct tmp117_data *data; > + struct iio_dev *indio_dev; > int dev_id; > > + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > + return -EOPNOTSUPP; > + > dev_id = i2c_smbus_read_word_swapped(client, TMP117_REG_DEVICE_ID); > if (dev_id < 0) > return dev_id; > > switch (dev_id) { > case TMP116_DEVICE_ID: > + match_data = &tmp116_channels_info; > + break; > case TMP117_DEVICE_ID: > - return dev_id; > + match_data = &tmp117_channels_info; > + break; > + default: > + dev_info(&client->dev, > + "Unknown device id (0x%x), use fallback compatible\n", > + dev_id); > + match_data = i2c_get_match_data(client); > } > > - dev_info(&client->dev, "Unknown device id (0x%x), use fallback compatible\n", > - dev_id); > - > - match_data = (uintptr_t)device_get_match_data(&client->dev); > - if (match_data) > - return match_data; > - > - id = i2c_client_get_device_id(client); > - if (id) > - return id->driver_data; > - > - dev_err(&client->dev, "Failed to identify unsupported device\n"); > - > - return -ENODEV; > -} > - > -static int tmp117_probe(struct i2c_client *client) > -{ > - struct tmp117_data *data; > - struct iio_dev *indio_dev; > - int ret, dev_id; > - > - if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > - return -EOPNOTSUPP; > - > - ret = tmp117_identify(client); > - if (ret < 0) > - return ret; > - > - dev_id = ret; > + if (!match_data) > + return dev_err_probe(&client->dev, -ENODEV, > + "Failed to identify unsupported device\n"); > > indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > if (!indio_dev) > @@ -181,33 +184,24 @@ static int tmp117_probe(struct i2c_client *client) > > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->info = &tmp117_info; > + indio_dev->channels = match_data->channels; > + indio_dev->num_channels = match_data->num_channels; > + indio_dev->name = match_data->name; > > - switch (dev_id) { > - case TMP116_DEVICE_ID: > - indio_dev->channels = tmp116_channels; > - indio_dev->num_channels = ARRAY_SIZE(tmp116_channels); > - indio_dev->name = "tmp116"; > - break; > - case TMP117_DEVICE_ID: > - indio_dev->channels = tmp117_channels; > - indio_dev->num_channels = ARRAY_SIZE(tmp117_channels); > - indio_dev->name = "tmp117"; > - break; > - } > > return devm_iio_device_register(&client->dev, indio_dev); > } > > static const struct of_device_id tmp117_of_match[] = { > - { .compatible = "ti,tmp116", .data = (void *)TMP116_DEVICE_ID }, > - { .compatible = "ti,tmp117", .data = (void *)TMP117_DEVICE_ID }, > + { .compatible = "ti,tmp116", .data = &tmp116_channels_info }, > + { .compatible = "ti,tmp117", .data = &tmp117_channels_info }, > { } > }; > MODULE_DEVICE_TABLE(of, tmp117_of_match); > > static const struct i2c_device_id tmp117_id[] = { > - { "tmp116", TMP116_DEVICE_ID }, > - { "tmp117", TMP117_DEVICE_ID }, > + { "tmp116", (kernel_ulong_t)&tmp116_channels_info }, > + { "tmp117", (kernel_ulong_t)&tmp117_channels_info }, > { } > }; > MODULE_DEVICE_TABLE(i2c, tmp117_id);
On 23-08-28, Jonathan Cameron wrote: > On Sat, 12 Aug 2023 17:11:54 +0100 > Biju Das <biju.das.jz@bp.renesas.com> wrote: > > > Convert enum->pointer for data in the match tables, so that > > device_get_match_data() can do match against OF/ACPI/I2C tables, once i2c > > bus type match support added to it. > > > > Add struct tmp11x_info and replace enum->struct *tmp11x_info for data in > > the match table. Drop tmp117_identify() and simplify tmp117_probe() by > > replacing device_get_match_data() and id lookup for retrieving data by > > i2c_get_match_data(). > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > +CC Marco who has been active on this driver recently. > > I'll apply it in the meantime, but still very much open to review comments. LGTM, thanks for the work on i2c_get_match_data(). Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
diff --git a/drivers/iio/temperature/tmp117.c b/drivers/iio/temperature/tmp117.c index fc02f491688b..059953015ae7 100644 --- a/drivers/iio/temperature/tmp117.c +++ b/drivers/iio/temperature/tmp117.c @@ -42,6 +42,12 @@ struct tmp117_data { s16 calibbias; }; +struct tmp11x_info { + const char *name; + struct iio_chan_spec const *channels; + int num_channels; +}; + static int tmp117_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *channel, int *val, int *val2, long mask) @@ -119,57 +125,54 @@ static const struct iio_chan_spec tmp116_channels[] = { }, }; +static const struct tmp11x_info tmp116_channels_info = { + .name = "tmp116", + .channels = tmp116_channels, + .num_channels = ARRAY_SIZE(tmp116_channels) +}; + +static const struct tmp11x_info tmp117_channels_info = { + .name = "tmp117", + .channels = tmp117_channels, + .num_channels = ARRAY_SIZE(tmp117_channels) +}; + static const struct iio_info tmp117_info = { .read_raw = tmp117_read_raw, .write_raw = tmp117_write_raw, }; -static int tmp117_identify(struct i2c_client *client) +static int tmp117_probe(struct i2c_client *client) { - const struct i2c_device_id *id; - unsigned long match_data; + const struct tmp11x_info *match_data; + struct tmp117_data *data; + struct iio_dev *indio_dev; int dev_id; + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) + return -EOPNOTSUPP; + dev_id = i2c_smbus_read_word_swapped(client, TMP117_REG_DEVICE_ID); if (dev_id < 0) return dev_id; switch (dev_id) { case TMP116_DEVICE_ID: + match_data = &tmp116_channels_info; + break; case TMP117_DEVICE_ID: - return dev_id; + match_data = &tmp117_channels_info; + break; + default: + dev_info(&client->dev, + "Unknown device id (0x%x), use fallback compatible\n", + dev_id); + match_data = i2c_get_match_data(client); } - dev_info(&client->dev, "Unknown device id (0x%x), use fallback compatible\n", - dev_id); - - match_data = (uintptr_t)device_get_match_data(&client->dev); - if (match_data) - return match_data; - - id = i2c_client_get_device_id(client); - if (id) - return id->driver_data; - - dev_err(&client->dev, "Failed to identify unsupported device\n"); - - return -ENODEV; -} - -static int tmp117_probe(struct i2c_client *client) -{ - struct tmp117_data *data; - struct iio_dev *indio_dev; - int ret, dev_id; - - if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) - return -EOPNOTSUPP; - - ret = tmp117_identify(client); - if (ret < 0) - return ret; - - dev_id = ret; + if (!match_data) + return dev_err_probe(&client->dev, -ENODEV, + "Failed to identify unsupported device\n"); indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); if (!indio_dev) @@ -181,33 +184,24 @@ static int tmp117_probe(struct i2c_client *client) indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &tmp117_info; + indio_dev->channels = match_data->channels; + indio_dev->num_channels = match_data->num_channels; + indio_dev->name = match_data->name; - switch (dev_id) { - case TMP116_DEVICE_ID: - indio_dev->channels = tmp116_channels; - indio_dev->num_channels = ARRAY_SIZE(tmp116_channels); - indio_dev->name = "tmp116"; - break; - case TMP117_DEVICE_ID: - indio_dev->channels = tmp117_channels; - indio_dev->num_channels = ARRAY_SIZE(tmp117_channels); - indio_dev->name = "tmp117"; - break; - } return devm_iio_device_register(&client->dev, indio_dev); } static const struct of_device_id tmp117_of_match[] = { - { .compatible = "ti,tmp116", .data = (void *)TMP116_DEVICE_ID }, - { .compatible = "ti,tmp117", .data = (void *)TMP117_DEVICE_ID }, + { .compatible = "ti,tmp116", .data = &tmp116_channels_info }, + { .compatible = "ti,tmp117", .data = &tmp117_channels_info }, { } }; MODULE_DEVICE_TABLE(of, tmp117_of_match); static const struct i2c_device_id tmp117_id[] = { - { "tmp116", TMP116_DEVICE_ID }, - { "tmp117", TMP117_DEVICE_ID }, + { "tmp116", (kernel_ulong_t)&tmp116_channels_info }, + { "tmp117", (kernel_ulong_t)&tmp117_channels_info }, { } }; MODULE_DEVICE_TABLE(i2c, tmp117_id);
Convert enum->pointer for data in the match tables, so that device_get_match_data() can do match against OF/ACPI/I2C tables, once i2c bus type match support added to it. Add struct tmp11x_info and replace enum->struct *tmp11x_info for data in the match table. Drop tmp117_identify() and simplify tmp117_probe() by replacing device_get_match_data() and id lookup for retrieving data by i2c_get_match_data(). Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/iio/temperature/tmp117.c | 94 +++++++++++++++----------------- 1 file changed, 44 insertions(+), 50 deletions(-)