Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / da732x.c

diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index f14cddf23f4271f7de848306c7992b317cd8f883..2c5b0b74201c71fed99b2c79552a96197be77c2f 100644 (file)
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1503,7 +1503,6 @@ static const struct snd_soc_component_driver soc_component_dev_da732x = {
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int da732x_i2c_probe(struct i2c_client *i2c)
@@ -1546,11 +1545,6 @@ err:
        return ret;
 }
 
-static int da732x_i2c_remove(struct i2c_client *client)
-{
-       return 0;
-}
-
 static const struct i2c_device_id da732x_i2c_id[] = {
        { "da7320", 0},
        { }
@@ -1562,7 +1556,6 @@ static struct i2c_driver da732x_i2c_driver = {
                .name   = "da7320",
        },
        .probe_new      = da732x_i2c_probe,
-       .remove         = da732x_i2c_remove,
        .id_table       = da732x_i2c_id,
 };