Simplify probe() by replacing device_get_match_data() and ID lookup for
retrieving match data by i2c_get_match_data().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v2->v3:
 * Restored OF table.
v1->v2:
 * Restored error code -EINVAL.
---
 drivers/mfd/max77541.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c
index 10c2e274b4af..d77c31c86e43 100644
--- a/drivers/mfd/max77541.c
+++ b/drivers/mfd/max77541.c
@@ -162,7 +162,6 @@ static int max77541_pmic_setup(struct device *dev)
 
 static int max77541_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct device *dev = &client->dev;
 	struct max77541 *max77541;
 
@@ -173,10 +172,7 @@ static int max77541_probe(struct i2c_client *client)
 	i2c_set_clientdata(client, max77541);
 	max77541->i2c = client;
 
-	max77541->id = (uintptr_t)device_get_match_data(dev);
-	if (!max77541->id)
-		max77541->id  = (enum max7754x_ids)id->driver_data;
-
+	max77541->id = (uintptr_t)i2c_get_match_data(client);
 	if (!max77541->id)
 		return -EINVAL;
 
-- 
2.25.1

On Thu, 31 Aug 2023, Biju Das wrote:

> Simplify probe() by replacing device_get_match_data() and ID lookup for

There are hundreds of ways to "simplify probe()"

Please collect all of these MFD related patches and provide a better
subject line that easily identifies the changes.

For example, I just applied one of your earlier patches as:

  mfd: max8997: Simplify obtaining I2C match data and drop max8997_i2c_get_driver_data()

... but I don't have enough spare cycles to fix them all up.

Feel free to use this description or come up with something better.

Please post them all in one set - else they end up spread all over my inbox.

> retrieving match data by i2c_get_match_data().
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---


-- 
Lee Jones [李琼斯]

Hi Lee Jones,

Thanks for the feedback.

> Subject: Re: [PATCH v3] mfd: max77541: Simplify probe()
> 
> On Thu, 31 Aug 2023, Biju Das wrote:
> 
> > Simplify probe() by replacing device_get_match_data() and ID lookup
> > for
> 
> There are hundreds of ways to "simplify probe()"
> 
> Please collect all of these MFD related patches and provide a better
> subject line that easily identifies the changes.
> 
> For example, I just applied one of your earlier patches as:
> 
>   mfd: max8997: Simplify obtaining I2C match data and drop
> max8997_i2c_get_driver_data()
> 
> ... but I don't have enough spare cycles to fix them all up.
> 
> Feel free to use this description or come up with something better.
> 
> Please post them all in one set - else they end up spread all over my
> inbox.

Agreed.

Cheers,
Biju