Unverified Commit 9b6d1b0c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: do not store status in state containe 

Merge series from Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>:

Many SoundWire CODEC drivers store the device status in a member
variable in the driver data but never reference this, and in any case
the SoundWire core stores this information for drivers so it would be
redundant even if used.
parents cbbc0ec6 b932f21f

sound/soc/codecs/rt1308-sdw.c

+1 −4
Original line number Diff line number Diff line
@@ -304,9 +304,6 @@ static int rt1308_update_status(struct sdw_slave *slave, 
{

	struct  rt1308_sdw_priv *rt1308 = dev_get_drvdata(&slave->dev);



	/* Update the status */

	rt1308->status = status;



	if (status == SDW_SLAVE_UNATTACHED)

		rt1308->hw_init = false;
@@ -314,7 +311,7 @@ static int rt1308_update_status(struct sdw_slave *slave, 
	 * Perform initialization only if slave status is present and

	 * hw_init flag is false

	 */

	if (rt1308->hw_init || rt1308->status != SDW_SLAVE_ATTACHED)

	if (rt1308->hw_init || status != SDW_SLAVE_ATTACHED)

		return 0;



	/* perform I/O transfers required for Slave initialization */

sound/soc/codecs/rt1308-sdw.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ struct rt1308_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;

sound/soc/codecs/rt1316-sdw.c

+1 −4
Original line number Diff line number Diff line
@@ -323,9 +323,6 @@ static int rt1316_update_status(struct sdw_slave *slave, 
{

	struct  rt1316_sdw_priv *rt1316 = dev_get_drvdata(&slave->dev);



	/* Update the status */

	rt1316->status = status;



	if (status == SDW_SLAVE_UNATTACHED)

		rt1316->hw_init = false;
@@ -333,7 +330,7 @@ static int rt1316_update_status(struct sdw_slave *slave, 
	 * Perform initialization only if slave status is present and

	 * hw_init flag is false

	 */

	if (rt1316->hw_init || rt1316->status != SDW_SLAVE_ATTACHED)

	if (rt1316->hw_init || status != SDW_SLAVE_ATTACHED)

		return 0;



	/* perform I/O transfers required for Slave initialization */

sound/soc/codecs/rt1316-sdw.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct rt1316_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;

sound/soc/codecs/rt1318-sdw.c

+1 −4
Original line number Diff line number Diff line
@@ -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 */