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

diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c
index 795accedc22ce96c66d568e504c05ef83d393031..3751d923611c3084abb16b0316d8dccd339f48df 100644 (file)
--- a/sound/soc/codecs/rt1318-sdw.c
+++ b/sound/soc/codecs/rt1318-sdw.c
@@ -456,9 +456,6 @@ static int rt1318_update_status(struct sdw_slave *slave,
 {
        struct  rt1318_sdw_priv *rt1318 = dev_get_drvdata(&slave->dev);
 
-       /* Update the status */
-       rt1318->status = status;
-
        if (status == SDW_SLAVE_UNATTACHED)
                rt1318->hw_init = false;
 
@@ -466,7 +463,7 @@ static int rt1318_update_status(struct sdw_slave *slave,
         * Perform initialization only if slave status is present and
         * hw_init flag is false
         */
-       if (rt1318->hw_init || rt1318->status != SDW_SLAVE_ATTACHED)
+       if (rt1318->hw_init || status != SDW_SLAVE_ATTACHED)
                return 0;
 
        /* perform I/O transfers required for Slave initialization */

diff --git a/sound/soc/codecs/rt1318-sdw.h b/sound/soc/codecs/rt1318-sdw.h
index 85918c184f16cd8f8df4a623c1a5190c63cbf9fd..86e83d63a0170f88c207b162ad49901b92efef65 100644 (file)
--- a/sound/soc/codecs/rt1318-sdw.h
+++ b/sound/soc/codecs/rt1318-sdw.h
@@ -88,7 +88,6 @@ struct rt1318_sdw_priv {
        struct snd_soc_component *component;
        struct regmap *regmap;
        struct sdw_slave *sdw_slave;
-       enum sdw_slave_status status;
        struct sdw_bus_params params;
        bool hw_init;
        bool first_hw_init;