[PATCH] iio: adc: max1363: Use i2c_get_match_data()

[PATCH] iio: adc: max1363: Use i2c_get_match_data()

[Biju Das]

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@bp.renesas.com>
---
Note:
This patch is only compile tested.
---
 drivers/iio/adc/max1363.c | 87 ++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index b31581616ce3..7c2a98b8c3a9 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1599,9 +1599,7 @@ static int max1363_probe(struct i2c_client *client)
 	if (ret)
 		return ret;
 
-	st->chip_info = device_get_match_data(&client->dev);
-	if (!st->chip_info)
-		st->chip_info = &max1363_chip_info_tbl[id->driver_data];
+	st->chip_info = i2c_get_match_data(client);
 	st->client = client;
 
 	st->vref_uv = st->chip_info->int_vref_mv * 1000;
@@ -1669,46 +1667,51 @@ static int max1363_probe(struct i2c_client *client)
 	return devm_iio_device_register(&client->dev, indio_dev);
 }
 
+#define MAX1363_ID_TABLE(_name, cfg) {				\
+	.name = _name,						\
+	.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[cfg],	\
+}
+
 static const struct i2c_device_id max1363_id[] = {
-	{ "max1361", max1361 },
-	{ "max1362", max1362 },
-	{ "max1363", max1363 },
-	{ "max1364", max1364 },
-	{ "max1036", max1036 },
-	{ "max1037", max1037 },
-	{ "max1038", max1038 },
-	{ "max1039", max1039 },
-	{ "max1136", max1136 },
-	{ "max1137", max1137 },
-	{ "max1138", max1138 },
-	{ "max1139", max1139 },
-	{ "max1236", max1236 },
-	{ "max1237", max1237 },
-	{ "max1238", max1238 },
-	{ "max1239", max1239 },
-	{ "max11600", max11600 },
-	{ "max11601", max11601 },
-	{ "max11602", max11602 },
-	{ "max11603", max11603 },
-	{ "max11604", max11604 },
-	{ "max11605", max11605 },
-	{ "max11606", max11606 },
-	{ "max11607", max11607 },
-	{ "max11608", max11608 },
-	{ "max11609", max11609 },
-	{ "max11610", max11610 },
-	{ "max11611", max11611 },
-	{ "max11612", max11612 },
-	{ "max11613", max11613 },
-	{ "max11614", max11614 },
-	{ "max11615", max11615 },
-	{ "max11616", max11616 },
-	{ "max11617", max11617 },
-	{ "max11644", max11644 },
-	{ "max11645", max11645 },
-	{ "max11646", max11646 },
-	{ "max11647", max11647 },
-	{}
+	MAX1363_ID_TABLE("max1361", max1361),
+	MAX1363_ID_TABLE("max1362", max1362),
+	MAX1363_ID_TABLE("max1363", max1363),
+	MAX1363_ID_TABLE("max1364", max1364),
+	MAX1363_ID_TABLE("max1036", max1036),
+	MAX1363_ID_TABLE("max1037", max1037),
+	MAX1363_ID_TABLE("max1038", max1038),
+	MAX1363_ID_TABLE("max1039", max1039),
+	MAX1363_ID_TABLE("max1136", max1136),
+	MAX1363_ID_TABLE("max1137", max1137),
+	MAX1363_ID_TABLE("max1138", max1138),
+	MAX1363_ID_TABLE("max1139", max1139),
+	MAX1363_ID_TABLE("max1236", max1236),
+	MAX1363_ID_TABLE("max1237", max1237),
+	MAX1363_ID_TABLE("max1238", max1238),
+	MAX1363_ID_TABLE("max1239", max1239),
+	MAX1363_ID_TABLE("max11600", max11600),
+	MAX1363_ID_TABLE("max11601", max11601),
+	MAX1363_ID_TABLE("max11602", max11602),
+	MAX1363_ID_TABLE("max11603", max11603),
+	MAX1363_ID_TABLE("max11604", max11604),
+	MAX1363_ID_TABLE("max11605", max11605),
+	MAX1363_ID_TABLE("max11606", max11606),
+	MAX1363_ID_TABLE("max11607", max11607),
+	MAX1363_ID_TABLE("max11608", max11608),
+	MAX1363_ID_TABLE("max11609", max11609),
+	MAX1363_ID_TABLE("max11610", max11610),
+	MAX1363_ID_TABLE("max11611", max11611),
+	MAX1363_ID_TABLE("max11612", max11612),
+	MAX1363_ID_TABLE("max11613", max11613),
+	MAX1363_ID_TABLE("max11614", max11614),
+	MAX1363_ID_TABLE("max11615", max11615),
+	MAX1363_ID_TABLE("max11616", max11616),
+	MAX1363_ID_TABLE("max11617", max11617),
+	MAX1363_ID_TABLE("max11644", max11644),
+	MAX1363_ID_TABLE("max11645", max11645),
+	MAX1363_ID_TABLE("max11646", max11646),
+	MAX1363_ID_TABLE("max11647", max11647),
+	{ /* sentinel */ }
 };
 
 MODULE_DEVICE_TABLE(i2c, max1363_id);
-- 
2.25.1

Re: [PATCH] iio: adc: max1363: Use i2c_get_match_data()

[Andy Shevchenko]

On Sat, Aug 12, 2023 at 08:24:19AM +0100, Biju Das wrote:
> Replace device_get_match_data() and i2c_match_id() by
> i2c_get_match_data() by making similar I2C and DT-based matching
> table.

...

> +#define MAX1363_ID_TABLE(_name, cfg) {				\
> +	.name = _name,						\
> +	.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[cfg],	\
> +}

Just use them directly, like in 4 lines each instead of a single one.

	{
		.name = max1361,
		.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[max1361]
	},

or this, but it's almost 100 characters.

	{ .name = "max1361", .driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[max1361] },


Otherwise I prefer to see something like a generic macro in i2c.h

	I2C_DEVICE_DATA()

(in analogue with PCI_DEVICE_DATA).

-- 
With Best Regards,
Andy Shevchenko

RE: [PATCH] iio: adc: max1363: Use i2c_get_match_data()

[Biju Das]

Hi Andy Shevchenko,

Thanks for the feedback.

> Subject: Re: [PATCH] iio: adc: max1363: Use i2c_get_match_data()
> 
> On Sat, Aug 12, 2023 at 08:24:19AM +0100, Biju Das wrote:
> > Replace device_get_match_data() and i2c_match_id() by
> > i2c_get_match_data() by making similar I2C and DT-based matching
> > table.
> 
> ...
> 
> > +#define MAX1363_ID_TABLE(_name, cfg) {				\
> > +	.name = _name,						\
> > +	.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[cfg],	\
> > +}
> 
> Just use them directly, like in 4 lines each instead of a single one.
> 
> 	{
> 		.name = max1361,
> 		.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[max1361]
> 	},
> 
> or this, but it's almost 100 characters.

OK, will create a separate patch for this change.

Worst case, we can drop named fields?? (.name and .driver_data)

Cheers,
Biju

> 
> 	{ .name = "max1361", .driver_data =
> (kernel_ulong_t)&max1363_chip_info_tbl[max1361] },
> 
> 
> Otherwise I prefer to see something like a generic macro in i2c.h
> 
> 	I2C_DEVICE_DATA()
> 
> (in analogue with PCI_DEVICE_DATA).
> 
> --
> With Best Regards,
> Andy Shevchenko
> 

Re: [PATCH] iio: adc: max1363: Use i2c_get_match_data()

[Andy Shevchenko]

On Fri, Aug 18, 2023 at 02:48:45PM +0000, Biju Das wrote:
> > On Sat, Aug 12, 2023 at 08:24:19AM +0100, Biju Das wrote:

...

> > > +#define MAX1363_ID_TABLE(_name, cfg) {				\
> > > +	.name = _name,						\
> > > +	.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[cfg],	\
> > > +}
> > 
> > Just use them directly, like in 4 lines each instead of a single one.
> > 
> > 	{
> > 		.name = max1361,
> > 		.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[max1361]
> > 	},
> > 
> > or this, but it's almost 100 characters.
> 
> OK, will create a separate patch for this change.
> 
> Worst case, we can drop named fields?? (.name and .driver_data)

I wouldn't do that as the goal in kernel is to use C99 initialized more
and not less.

-- 
With Best Regards,
Andy Shevchenko

RE: [PATCH] iio: adc: max1363: Use i2c_get_match_data()

[Biju Das]

Hi Andy,

Thanks for the feedback.

> Subject: Re: [PATCH] iio: adc: max1363: Use i2c_get_match_data()
> 
> On Fri, Aug 18, 2023 at 02:48:45PM +0000, Biju Das wrote:
> > > On Sat, Aug 12, 2023 at 08:24:19AM +0100, Biju Das wrote:
> 
> ...
> 
> > > > +#define MAX1363_ID_TABLE(_name, cfg) {				\
> > > > +	.name = _name,						\
> > > > +	.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[cfg],	\
> > > > +}
> > >
> > > Just use them directly, like in 4 lines each instead of a single one.
> > >
> > > 	{
> > > 		.name = max1361,
> > > 		.driver_data = (kernel_ulong_t)&max1363_chip_info_tbl[max1361]
> > > 	},
> > >
> > > or this, but it's almost 100 characters.
> >
> > OK, will create a separate patch for this change.
> >
> > Worst case, we can drop named fields?? (.name and .driver_data)
> 
> I wouldn't do that as the goal in kernel is to use C99 initialized more and
> not less.

Currently OF table is using macro. So for consistency, I added
macro for ID table.

I am leaving this to Jonathan as previously he mentioned
he wanted consistency among the tables. 

Cheers,
Biju