summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>2023-05-18 09:27:52 +0200
committerMark Brown <broonie@kernel.org>2023-05-18 19:25:24 +0900
commit0315dac5406c9c0b8e334195aa01c4ec155adf47 (patch)
tree8c673d66e78550d6f489138e78501941b67102ac /sound/soc
parentcda72c89d082f5953fab9948fc1212ca0df11d96 (diff)
downloadlwn-0315dac5406c9c0b8e334195aa01c4ec155adf47.tar.gz
lwn-0315dac5406c9c0b8e334195aa01c4ec155adf47.zip
ASoC: codecs: rt715: 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-12-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/rt715-sdw.c4
-rw-r--r--sound/soc/codecs/rt715.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index 5ffe9a00dfd8..6db87442b783 100644
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -417,13 +417,11 @@ static int rt715_update_status(struct sdw_slave *slave,
{
struct rt715_priv *rt715 = dev_get_drvdata(&slave->dev);
- /* Update the status */
- rt715->status = status;
/*
* Perform initialization only if slave status is present and
* hw_init flag is false
*/
- if (rt715->hw_init || rt715->status != SDW_SLAVE_ATTACHED)
+ if (rt715->hw_init || status != SDW_SLAVE_ATTACHED)
return 0;
/* perform I/O transfers required for Slave initialization */
diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h
index 17a8d041c1c3..12a0ae656d09 100644
--- a/sound/soc/codecs/rt715.h
+++ b/sound/soc/codecs/rt715.h
@@ -18,7 +18,6 @@ struct rt715_priv {
int dbg_nid;
int dbg_vid;
int dbg_payload;
- enum sdw_slave_status status;
struct sdw_bus_params params;
bool hw_init;
bool first_hw_init;