]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: rt5677: Convert I2C driver to ->probe_new()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 18 May 2018 15:41:51 +0000 (18:41 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 18 May 2018 15:50:49 +0000 (16:50 +0100)
There is no platform code that uses i2c module table.
Remove it altogether and adjust ->probe() to be ->probe_new().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5677.c

index bc1a23dd7c2de0902cfecb12a5cf1d5b3eebfa9d..8a0181a2db085459cb974d30d81f0d100880490b 100644 (file)
@@ -5006,13 +5006,6 @@ static const struct regmap_config rt5677_regmap = {
        .num_ranges = ARRAY_SIZE(rt5677_ranges),
 };
 
-static const struct i2c_device_id rt5677_i2c_id[] = {
-       { "rt5677", RT5677 },
-       { "rt5676", RT5676 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
-
 static const struct of_device_id rt5677_of_match[] = {
        { .compatible = "realtek,rt5677", RT5677 },
        { }
@@ -5130,8 +5123,7 @@ static void rt5677_free_irq(struct i2c_client *i2c)
                regmap_del_irq_chip(i2c->irq, rt5677->irq_data);
 }
 
-static int rt5677_i2c_probe(struct i2c_client *i2c,
-                   const struct i2c_device_id *id)
+static int rt5677_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5677_priv *rt5677;
        int ret;
@@ -5278,9 +5270,8 @@ static struct i2c_driver rt5677_i2c_driver = {
                .of_match_table = rt5677_of_match,
                .acpi_match_table = ACPI_PTR(rt5677_acpi_match),
        },
-       .probe = rt5677_i2c_probe,
+       .probe_new = rt5677_i2c_probe,
        .remove   = rt5677_i2c_remove,
-       .id_table = rt5677_i2c_id,
 };
 module_i2c_driver(rt5677_i2c_driver);