diff options
| author | Krzysztof Kozlowski <[email protected]> | 2023-05-18 09:27:44 +0200 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2023-05-18 19:25:18 +0900 |
| commit | 28eb1e4224c3b3ff29fe4c29bcdc011d3a0ffd07 (patch) | |
| tree | 0f15f67f38f8dc625a2b27a21d855160e8ae70e8 | |
| parent | 70207b95b2245502496443475c9fc4eb72ba3b66 (diff) | |
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 <[email protected]
Reviewed-by: Pierre-Louis Bossart <[email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]
| -rw-r--r-- | sound/soc/codecs/rt1318-sdw.c | 5 | ||||
| -rw-r--r-- | sound/soc/codecs/rt1318-sdw.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c index 795accedc22c..3751d923611c 100644 --- 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 85918c184f16..86e83d63a017 100644 --- 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; |