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

Simplify probe() by using i2c_get_match_data() instead of
max8997_i2c_get_driver_data() for retrieving match data from
OF/ID tables.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230828160224.92037-1-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 110bef71f208cd2c53c2a9c4d5b81a30f8352fdb..ffe96b40368e12e832737e054778b2aaad41af85 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -142,18 +142,8 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
        return pd;
 }
 
-static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
-                                               const struct i2c_device_id *id)
-{
-       if (i2c->dev.of_node)
-               return (unsigned long)of_device_get_match_data(&i2c->dev);
-
-       return id->driver_data;
-}
-
 static int max8997_i2c_probe(struct i2c_client *i2c)
 {
-       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        struct max8997_dev *max8997;
        struct max8997_platform_data *pdata = dev_get_platdata(&i2c->dev);
        int ret = 0;
@@ -166,7 +156,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c)
        i2c_set_clientdata(i2c, max8997);
        max8997->dev = &i2c->dev;
        max8997->i2c = i2c;
-       max8997->type = max8997_i2c_get_driver_data(i2c, id);
+       max8997->type = (uintptr_t)i2c_get_match_data(i2c);
        max8997->irq = i2c->irq;
 
        if (IS_ENABLED(CONFIG_OF) && max8997->dev->of_node) {