regulator: fan53555: Simplify probe()

Commit Message

Biju Das Aug. 26, 2023, 5:24 p.m. UTC

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

Signed-off-by: Biju Das <[e-mail]>
---
Note:
 This patch is only compile tested.
---
 drivers/regulator/fan53555.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Andy Shevchenko Aug. 28, 2023, 11:23 a.m. UTC | #1

On Sat, Aug 26, 2023 at 06:24:58PM +0100, Biju Das wrote:
> Simplify probe() by replacing of_device_get_match_data() and ID lookup for
> retrieving match data by i2c_get_match_data().

...

> +	di->vendor = (unsigned long)i2c_get_match_data(client);

Use standard casting for this type of conversions.

...


> +	if (!client->dev.of_node) {

Why?

Note, we discourage dereference of of_node or fwnode from struct device. We
have APIs for this (in case it's even needed).

Patch

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 48f312167e53..b64274686af8 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -659,7 +659,6 @@  MODULE_DEVICE_TABLE(of, fan53555_dt_ids);
 
 static int fan53555_regulator_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct device_node *np = client->dev.of_node;
 	struct fan53555_device_info *di;
 	struct fan53555_platform_data *pdata;
@@ -682,10 +681,8 @@  static int fan53555_regulator_probe(struct i2c_client *client)
 				     "Platform data not found!\n");
 
 	di->regulator = pdata->regulator;
-	if (client->dev.of_node) {
-		di->vendor =
-			(unsigned long)of_device_get_match_data(&client->dev);
-	} else {
+	di->vendor = (unsigned long)i2c_get_match_data(client);
+	if (!client->dev.of_node) {
 		/* if no ramp constraint set, get the pdata ramp_delay */
 		if (!di->regulator->constraints.ramp_delay) {
 			if (pdata->slew_rate >= ARRAY_SIZE(slew_rates))
@@ -695,8 +692,6 @@  static int fan53555_regulator_probe(struct i2c_client *client)
 			di->regulator->constraints.ramp_delay
 					= slew_rates[pdata->slew_rate];
 		}
-
-		di->vendor = id->driver_data;
 	}
 
 	regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);