On Sun, 23 Jul 2023 11:27:43 +0100
Biju Das <biju.das.jz@xxxxxxxxxxxxxx> wrote:
> Replace device_get_match_data() and i2c_match_id() by i2c_get_match
> _data() by making similar I2C and DT-based matching table.
>
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
Applied.
Whilst I think these are good in general, I don't particularly want to
see blanket conversions of drivers that do it differently (unless they
are buggy ;) I don't mind such stuff that I'd consider a small cleanup
but it does take review time so I'll push them behind other series with
a greater benefit.
Thanks,
Jonathan
> ---
> v2->v3:
> * Added .name field to MCP4531_ID_TABLE macro
> * Replaced MCP4531_ID_TABLE(name, cfg)->MCP4531_ID_TABLE(_name, cfg)
> v1->v2:
> * Added similar similar I2C and DT-based matching table.
> * Fixed typo i2c_get_match_data(dev)->i2c_get_match_data(client).
> * Dropped error check as all tables have data pointers.
>
> Note:
> This patch is only compile tested.
> ---
> drivers/iio/potentiometer/mcp4531.c | 139 ++++++++++++++--------------
> 1 file changed, 71 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
> index c513c00c8243..f28880ebd758 100644
> --- a/drivers/iio/potentiometer/mcp4531.c
> +++ b/drivers/iio/potentiometer/mcp4531.c
> @@ -206,72 +206,77 @@ static const struct iio_info mcp4531_info = {
> .write_raw = mcp4531_write_raw,
> };
>
> +#define MCP4531_ID_TABLE(_name, cfg) { \
> + .name = _name, \
> + .driver_data = (kernel_ulong_t)&mcp4531_cfg[cfg], \
> +}
> +
> static const struct i2c_device_id mcp4531_id[] = {
> - { "mcp4531-502", MCP453x_502 },
> - { "mcp4531-103", MCP453x_103 },
> - { "mcp4531-503", MCP453x_503 },
> - { "mcp4531-104", MCP453x_104 },
> - { "mcp4532-502", MCP453x_502 },
> - { "mcp4532-103", MCP453x_103 },
> - { "mcp4532-503", MCP453x_503 },
> - { "mcp4532-104", MCP453x_104 },
> - { "mcp4541-502", MCP454x_502 },
> - { "mcp4541-103", MCP454x_103 },
> - { "mcp4541-503", MCP454x_503 },
> - { "mcp4541-104", MCP454x_104 },
> - { "mcp4542-502", MCP454x_502 },
> - { "mcp4542-103", MCP454x_103 },
> - { "mcp4542-503", MCP454x_503 },
> - { "mcp4542-104", MCP454x_104 },
> - { "mcp4551-502", MCP455x_502 },
> - { "mcp4551-103", MCP455x_103 },
> - { "mcp4551-503", MCP455x_503 },
> - { "mcp4551-104", MCP455x_104 },
> - { "mcp4552-502", MCP455x_502 },
> - { "mcp4552-103", MCP455x_103 },
> - { "mcp4552-503", MCP455x_503 },
> - { "mcp4552-104", MCP455x_104 },
> - { "mcp4561-502", MCP456x_502 },
> - { "mcp4561-103", MCP456x_103 },
> - { "mcp4561-503", MCP456x_503 },
> - { "mcp4561-104", MCP456x_104 },
> - { "mcp4562-502", MCP456x_502 },
> - { "mcp4562-103", MCP456x_103 },
> - { "mcp4562-503", MCP456x_503 },
> - { "mcp4562-104", MCP456x_104 },
> - { "mcp4631-502", MCP463x_502 },
> - { "mcp4631-103", MCP463x_103 },
> - { "mcp4631-503", MCP463x_503 },
> - { "mcp4631-104", MCP463x_104 },
> - { "mcp4632-502", MCP463x_502 },
> - { "mcp4632-103", MCP463x_103 },
> - { "mcp4632-503", MCP463x_503 },
> - { "mcp4632-104", MCP463x_104 },
> - { "mcp4641-502", MCP464x_502 },
> - { "mcp4641-103", MCP464x_103 },
> - { "mcp4641-503", MCP464x_503 },
> - { "mcp4641-104", MCP464x_104 },
> - { "mcp4642-502", MCP464x_502 },
> - { "mcp4642-103", MCP464x_103 },
> - { "mcp4642-503", MCP464x_503 },
> - { "mcp4642-104", MCP464x_104 },
> - { "mcp4651-502", MCP465x_502 },
> - { "mcp4651-103", MCP465x_103 },
> - { "mcp4651-503", MCP465x_503 },
> - { "mcp4651-104", MCP465x_104 },
> - { "mcp4652-502", MCP465x_502 },
> - { "mcp4652-103", MCP465x_103 },
> - { "mcp4652-503", MCP465x_503 },
> - { "mcp4652-104", MCP465x_104 },
> - { "mcp4661-502", MCP466x_502 },
> - { "mcp4661-103", MCP466x_103 },
> - { "mcp4661-503", MCP466x_503 },
> - { "mcp4661-104", MCP466x_104 },
> - { "mcp4662-502", MCP466x_502 },
> - { "mcp4662-103", MCP466x_103 },
> - { "mcp4662-503", MCP466x_503 },
> - { "mcp4662-104", MCP466x_104 },
> - {}
> + MCP4531_ID_TABLE("mcp4531-502", MCP453x_502),
> + MCP4531_ID_TABLE("mcp4531-103", MCP453x_103),
> + MCP4531_ID_TABLE("mcp4531-503", MCP453x_503),
> + MCP4531_ID_TABLE("mcp4531-104", MCP453x_104),
> + MCP4531_ID_TABLE("mcp4532-502", MCP453x_502),
> + MCP4531_ID_TABLE("mcp4532-103", MCP453x_103),
> + MCP4531_ID_TABLE("mcp4532-503", MCP453x_503),
> + MCP4531_ID_TABLE("mcp4532-104", MCP453x_104),
> + MCP4531_ID_TABLE("mcp4541-502", MCP454x_502),
> + MCP4531_ID_TABLE("mcp4541-103", MCP454x_103),
> + MCP4531_ID_TABLE("mcp4541-503", MCP454x_503),
> + MCP4531_ID_TABLE("mcp4541-104", MCP454x_104),
> + MCP4531_ID_TABLE("mcp4542-502", MCP454x_502),
> + MCP4531_ID_TABLE("mcp4542-103", MCP454x_103),
> + MCP4531_ID_TABLE("mcp4542-503", MCP454x_503),
> + MCP4531_ID_TABLE("mcp4542-104", MCP454x_104),
> + MCP4531_ID_TABLE("mcp4551-502", MCP455x_502),
> + MCP4531_ID_TABLE("mcp4551-103", MCP455x_103),
> + MCP4531_ID_TABLE("mcp4551-503", MCP455x_503),
> + MCP4531_ID_TABLE("mcp4551-104", MCP455x_104),
> + MCP4531_ID_TABLE("mcp4552-502", MCP455x_502),
> + MCP4531_ID_TABLE("mcp4552-103", MCP455x_103),
> + MCP4531_ID_TABLE("mcp4552-503", MCP455x_503),
> + MCP4531_ID_TABLE("mcp4552-104", MCP455x_104),
> + MCP4531_ID_TABLE("mcp4561-502", MCP456x_502),
> + MCP4531_ID_TABLE("mcp4561-103", MCP456x_103),
> + MCP4531_ID_TABLE("mcp4561-503", MCP456x_503),
> + MCP4531_ID_TABLE("mcp4561-104", MCP456x_104),
> + MCP4531_ID_TABLE("mcp4562-502", MCP456x_502),
> + MCP4531_ID_TABLE("mcp4562-103", MCP456x_103),
> + MCP4531_ID_TABLE("mcp4562-503", MCP456x_503),
> + MCP4531_ID_TABLE("mcp4562-104", MCP456x_104),
> + MCP4531_ID_TABLE("mcp4631-502", MCP463x_502),
> + MCP4531_ID_TABLE("mcp4631-103", MCP463x_103),
> + MCP4531_ID_TABLE("mcp4631-503", MCP463x_503),
> + MCP4531_ID_TABLE("mcp4631-104", MCP463x_104),
> + MCP4531_ID_TABLE("mcp4632-502", MCP463x_502),
> + MCP4531_ID_TABLE("mcp4632-103", MCP463x_103),
> + MCP4531_ID_TABLE("mcp4632-503", MCP463x_503),
> + MCP4531_ID_TABLE("mcp4632-104", MCP463x_104),
> + MCP4531_ID_TABLE("mcp4641-502", MCP464x_502),
> + MCP4531_ID_TABLE("mcp4641-103", MCP464x_103),
> + MCP4531_ID_TABLE("mcp4641-503", MCP464x_503),
> + MCP4531_ID_TABLE("mcp4641-104", MCP464x_104),
> + MCP4531_ID_TABLE("mcp4642-502", MCP464x_502),
> + MCP4531_ID_TABLE("mcp4642-103", MCP464x_103),
> + MCP4531_ID_TABLE("mcp4642-503", MCP464x_503),
> + MCP4531_ID_TABLE("mcp4642-104", MCP464x_104),
> + MCP4531_ID_TABLE("mcp4651-502", MCP465x_502),
> + MCP4531_ID_TABLE("mcp4651-103", MCP465x_103),
> + MCP4531_ID_TABLE("mcp4651-503", MCP465x_503),
> + MCP4531_ID_TABLE("mcp4651-104", MCP465x_104),
> + MCP4531_ID_TABLE("mcp4652-502", MCP465x_502),
> + MCP4531_ID_TABLE("mcp4652-103", MCP465x_103),
> + MCP4531_ID_TABLE("mcp4652-503", MCP465x_503),
> + MCP4531_ID_TABLE("mcp4652-104", MCP465x_104),
> + MCP4531_ID_TABLE("mcp4661-502", MCP466x_502),
> + MCP4531_ID_TABLE("mcp4661-103", MCP466x_103),
> + MCP4531_ID_TABLE("mcp4661-503", MCP466x_503),
> + MCP4531_ID_TABLE("mcp4661-104", MCP466x_104),
> + MCP4531_ID_TABLE("mcp4662-502", MCP466x_502),
> + MCP4531_ID_TABLE("mcp4662-103", MCP466x_103),
> + MCP4531_ID_TABLE("mcp4662-503", MCP466x_503),
> + MCP4531_ID_TABLE("mcp4662-104", MCP466x_104),
> + { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(i2c, mcp4531_id);
>
> @@ -368,9 +373,7 @@ static int mcp4531_probe(struct i2c_client *client)
> i2c_set_clientdata(client, indio_dev);
> data->client = client;
>
> - data->cfg = device_get_match_data(dev);
> - if (!data->cfg)
> - data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data];
> + data->cfg = i2c_get_match_data(client);
>
> indio_dev->info = &mcp4531_info;
> indio_dev->channels = mcp4531_channels;
