[PATCH] mfd: max77541: Simplify probe()

[PATCH] mfd: max77541: Simplify probe()

[Biju Das]

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

While at it, drop leading commas from OF table.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
Note:
 This patch is only compile tested.
---
 drivers/mfd/max77541.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c
index 10c2e274b4af..12585df2b8cb 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,12 +172,9 @@ 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);
+	max77541->id = (uintptr_t)i2c_get_match_data(client);
 	if (!max77541->id)
-		max77541->id  = (enum max7754x_ids)id->driver_data;
-
-	if (!max77541->id)
-		return -EINVAL;
+		return -ENODEV;
 
 	max77541->regmap = devm_regmap_init_i2c(client,
 						&max77541_regmap_config);
@@ -190,14 +186,8 @@ static int max77541_probe(struct i2c_client *client)
 }
 
 static const struct of_device_id max77541_of_id[] = {
-	{
-		.compatible = "adi,max77540",
-		.data = (void *)MAX77540,
-	},
-	{
-		.compatible = "adi,max77541",
-		.data = (void *)MAX77541,
-	},
+	{ .compatible = "adi,max77540", .data = (void *)MAX77540 },
+	{ .compatible = "adi,max77541", .data = (void *)MAX77541 },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, max77541_of_id);
-- 
2.25.1

Re: [PATCH] mfd: max77541: Simplify probe()

[Andy Shevchenko]

On Sat, Aug 26, 2023 at 10:10:20AM +0100, Biju Das wrote:
> Simplify probe() by replacing device_get_match_data() and ID lookup for
> retrieving match data by i2c_get_match_data().
> 
> While at it, drop leading commas from OF table.

...

> -		return -EINVAL;
> +		return -ENODEV;

Why?

-- 
With Best Regards,
Andy Shevchenko

RE: [PATCH] mfd: max77541: Simplify probe()

[Biju Das]

Hi Andy Shevchenko,

> Subject: Re: [PATCH] mfd: max77541: Simplify probe()
> 
> On Sat, Aug 26, 2023 at 10:10:20AM +0100, Biju Das wrote:
> > Simplify probe() by replacing device_get_match_data() and ID lookup
> > for retrieving match data by i2c_get_match_data().
> >
> > While at it, drop leading commas from OF table.
> 
> ...
> 
> > -		return -EINVAL;
> > +		return -ENODEV;
> 
> Why?

If I remember correctly, previously you mentioned to return -ENODEV
for non-match. I will return -EINVAL.

Cheers,
Biju

Re: [PATCH] mfd: max77541: Simplify probe()

[Andy Shevchenko]

On Mon, Aug 28, 2023 at 11:36:54AM +0000, Biju Das wrote:
> > On Sat, Aug 26, 2023 at 10:10:20AM +0100, Biju Das wrote:

...

> > > -		return -EINVAL;
> > > +		return -ENODEV;
> > 
> > Why?
> 
> If I remember correctly, previously you mentioned to return -ENODEV
> for non-match. I will return -EINVAL.

Maybe I was unclear, I meant to return -ENODEV, if this is a _new_ code.
For the existing one, please preserve the error code.

-- 
With Best Regards,
Andy Shevchenko