ASoC: codecs: rt700: do not store status in state container

Driver in its update status callback stores Soundwire device status in
state container but it never uses it later.  Simplify the code a bit.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com
Link: https://lore.kernel.org/r/20230518072753.7361-6-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index 96fc5f36d0d05aaf65638c1349958ffb42e99bf1..ba7767bee07c71a387a8fd1cab0ca9e9fbd565a1 100644 (file)
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -315,9 +315,6 @@ static int rt700_update_status(struct sdw_slave *slave,
 {
        struct rt700_priv *rt700 = dev_get_drvdata(&slave->dev);
 
-       /* Update the status */
-       rt700->status = status;
-
        if (status == SDW_SLAVE_UNATTACHED)
                rt700->hw_init = false;
 
@@ -325,7 +322,7 @@ static int rt700_update_status(struct sdw_slave *slave,
         * Perform initialization only if slave status is present and
         * hw_init flag is false
         */
-       if (rt700->hw_init || rt700->status != SDW_SLAVE_ATTACHED)
+       if (rt700->hw_init || status != SDW_SLAVE_ATTACHED)
                return 0;
 
        /* perform I/O transfers required for Slave initialization */

diff --git a/sound/soc/codecs/rt700.h b/sound/soc/codecs/rt700.h
index 93c44005d38cc31e9f782fae961b04eb8b1e251a..491774d207de0e549f47925b8635a937ff1b1ede 100644 (file)
--- a/sound/soc/codecs/rt700.h
+++ b/sound/soc/codecs/rt700.h
@@ -15,7 +15,6 @@ struct  rt700_priv {
        struct regmap *regmap;
        struct regmap *sdw_regmap;
        struct sdw_slave *slave;
-       enum sdw_slave_status status;
        struct sdw_bus_params params;
        bool hw_init;
        bool first_hw_init;