Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / codecs / cs35l41-i2c.c

diff --git a/sound/soc/codecs/cs35l41-i2c.c b/sound/soc/codecs/cs35l41-i2c.c
index faad5c6..37c703c 100644 (file)
--- a/sound/soc/codecs/cs35l41-i2c.c
+++ b/sound/soc/codecs/cs35l41-i2c.c
@@ -29,12 +29,11 @@ static const struct i2c_device_id cs35l41_id_i2c[] = {
 
 MODULE_DEVICE_TABLE(i2c, cs35l41_id_i2c);
 
-static int cs35l41_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int cs35l41_i2c_probe(struct i2c_client *client)
 {
        struct cs35l41_private *cs35l41;
        struct device *dev = &client->dev;
-       struct cs35l41_platform_data *pdata = dev_get_platdata(dev);
+       struct cs35l41_hw_cfg *hw_cfg = dev_get_platdata(dev);
        const struct regmap_config *regmap_config = &cs35l41_regmap_i2c;
        int ret;
 
@@ -54,7 +53,7 @@ static int cs35l41_i2c_probe(struct i2c_client *client,
                return ret;
        }
 
-       return cs35l41_probe(cs35l41, pdata);
+       return cs35l41_probe(cs35l41, hw_cfg);
 }
 
 static int cs35l41_i2c_remove(struct i2c_client *client)
@@ -91,7 +90,7 @@ static struct i2c_driver cs35l41_i2c_driver = {
                .acpi_match_table = ACPI_PTR(cs35l41_acpi_match),
        },
        .id_table       = cs35l41_id_i2c,
-       .probe          = cs35l41_i2c_probe,
+       .probe_new      = cs35l41_i2c_probe,
        .remove         = cs35l41_i2c_remove,
 };