ASoC: codecs: rt712-sdca: 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-10-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c
index 3f319459dfec39e2696bf6732ac5cc5dcf53e766..8f65516e7562aeb6d9198d4ab1d6e0211835e663 100644 (file)
--- a/sound/soc/codecs/rt712-sdca-sdw.c
+++ b/sound/soc/codecs/rt712-sdca-sdw.c
@@ -140,9 +140,6 @@ static int rt712_sdca_update_status(struct sdw_slave *slave,
 {
        struct rt712_sdca_priv *rt712 = dev_get_drvdata(&slave->dev);
 
-       /* Update the status */
-       rt712->status = status;
-
        if (status == SDW_SLAVE_UNATTACHED)
                rt712->hw_init = false;
 
@@ -165,7 +162,7 @@ static int rt712_sdca_update_status(struct sdw_slave *slave,
         * Perform initialization only if slave status is present and
         * hw_init flag is false
         */
-       if (rt712->hw_init || rt712->status != SDW_SLAVE_ATTACHED)
+       if (rt712->hw_init || status != SDW_SLAVE_ATTACHED)
                return 0;
 
        /* perform I/O transfers required for Slave initialization */

diff --git a/sound/soc/codecs/rt712-sdca.h b/sound/soc/codecs/rt712-sdca.h
index c6a94a23f46e8548b50dbfc2ddeef6bac1b11ba7..ff79e03118ce82830b04fc8e857d6935f13731aa 100644 (file)
--- a/sound/soc/codecs/rt712-sdca.h
+++ b/sound/soc/codecs/rt712-sdca.h
@@ -20,7 +20,6 @@ struct  rt712_sdca_priv {
        struct regmap *mbq_regmap;
        struct snd_soc_component *component;
        struct sdw_slave *slave;
-       enum sdw_slave_status status;
        struct sdw_bus_params params;
        bool hw_init;
        bool first_hw_init;