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

diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c
index 6e3b5c5eced1d90694154c2024408f47c421c1c2..67404f45389f219ae2a8a7b242cd6918a51f2c35 100644 (file)
--- a/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@ -500,9 +500,6 @@ static int rt5682_update_status(struct sdw_slave *slave,
 {
        struct rt5682_priv *rt5682 = dev_get_drvdata(&slave->dev);
 
-       /* Update the status */
-       rt5682->status = status;
-
        if (status == SDW_SLAVE_UNATTACHED)
                rt5682->hw_init = false;
 
@@ -510,7 +507,7 @@ static int rt5682_update_status(struct sdw_slave *slave,
         * Perform initialization only if slave status is present and
         * hw_init flag is false
         */
-       if (rt5682->hw_init || rt5682->status != SDW_SLAVE_ATTACHED)
+       if (rt5682->hw_init || status != SDW_SLAVE_ATTACHED)
                return 0;
 
        /* perform I/O transfers required for Slave initialization */

diff --git a/sound/soc/codecs/rt5682.h b/sound/soc/codecs/rt5682.h
index d568c6993c337115873c7355ca54b2cbce5d6511..301d1817f8f113f8f0cc105802f8c776dfe41dcd 100644 (file)
--- a/sound/soc/codecs/rt5682.h
+++ b/sound/soc/codecs/rt5682.h
@@ -1440,7 +1440,6 @@ struct rt5682_priv {
        bool disable_irq;
        struct mutex calibrate_mutex;
        struct sdw_slave *slave;
-       enum sdw_slave_status status;
        struct sdw_bus_params params;
        bool hw_init;
        bool first_hw_init;