ASoC: codecs: rt*-sdw: don't assign slave_ops

The SoundWire bus core already assigns the slave ops, no need to set
them a second time manually in each driver.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Cc: Shuming Fan <shumingf@realtek.com>
Cc: Jack Yu <jack.yu@realtek.com>
Link: https://lore.kernel.org/r/20200515211531.11416-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index 1502a22b0d4a07b6e64dba37e7c9a87ab8a1de99..4b88fa8efb27832159016ade2fef886dd9641fd7 100644 (file)
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -684,9 +684,6 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,
 {
        struct regmap *regmap;
 
-       /* Assign ops */
-       slave->ops = &rt1308_slave_ops;
-
        /* Regmap Initialization */
        regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap);
        if (!regmap)

diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c
index a2d1d3ae1e312f230e335a77d2c444b4687bc52e..99dd48d2a1d66f9a4fe194a3293c6c1fba7a7d4d 100644 (file)
--- a/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@ -241,9 +241,6 @@ static int rt5682_sdw_probe(struct sdw_slave *slave,
 {
        struct regmap *regmap;
 
-       /* Assign ops */
-       slave->ops = &rt5682_slave_ops;
-
        /* Regmap Initialization */
        regmap = devm_regmap_init_sdw(slave, &rt5682_sdw_regmap);
        if (IS_ERR(regmap))

diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index d4e0f953bcce6da6ac2154eca76665a6636c674f..4d14048d1197685703ccaa04bc05febbd23839e8 100644 (file)
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -450,9 +450,6 @@ static int rt700_sdw_probe(struct sdw_slave *slave,
 {
        struct regmap *sdw_regmap, *regmap;
 
-       /* Assign ops */
-       slave->ops = &rt700_slave_ops;
-
        /* Regmap Initialization */
        sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap);
        if (!sdw_regmap)

diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index fc3a3fa3d51b6aea9ffeadca5925301f2d15c47d..45b928954b580e005d49d9957886e2efe486c124 100644 (file)
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -450,9 +450,6 @@ static int rt711_sdw_probe(struct sdw_slave *slave,
 {
        struct regmap *sdw_regmap, *regmap;
 
-       /* Assign ops */
-       slave->ops = &rt711_slave_ops;
-
        /* Regmap Initialization */
        sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
        if (!sdw_regmap)

diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index 64ef56ef031827119de1e418b2d9a25ad1d63444..d11b23d6b240a3d895000eddb40312d19563adad 100644 (file)
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -525,9 +525,6 @@ static int rt715_sdw_probe(struct sdw_slave *slave,
 {
        struct regmap *sdw_regmap, *regmap;
 
-       /* Assign ops */
-       slave->ops = &rt715_slave_ops;
-
        /* Regmap Initialization */
        sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap);
        if (!sdw_regmap)