mfd: madera-i2c: Simplify obtaining I2C match data

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 <biju.das.jz@bp.renesas.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230923174928.56824-3-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
index a404ea26bc798423257840edd9d0f876a18c081e..0986e4a99f4aa057d735d0bcfc7d6acd9599f226 100644 (file)
--- a/drivers/mfd/madera-i2c.c
+++ b/drivers/mfd/madera-i2c.c
@@ -18,21 +18,14 @@
 
 static int madera_i2c_probe(struct i2c_client *i2c)
 {
-       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        struct madera *madera;
        const struct regmap_config *regmap_16bit_config = NULL;
        const struct regmap_config *regmap_32bit_config = NULL;
-       const void *of_data;
        unsigned long type;
        const char *name;
        int ret;
 
-       of_data = of_device_get_match_data(&i2c->dev);
-       if (of_data)
-               type = (unsigned long)of_data;
-       else
-               type = id->driver_data;
-
+       type = (uintptr_t)i2c_get_match_data(i2c);
        switch (type) {
        case CS47L15:
                if (IS_ENABLED(CONFIG_MFD_CS47L15)) {