Commit d0bbcb4e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

ASoC: codecs: soundwire: remove port_ready[] usage from codecs. 



port_ready will be changed to a fixed array in sdw.h and all initialization
work will be done at soundwire side in the following patch. So remove them
from codec drivers.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200831134318.11443-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f046b233

sound/soc/codecs/max98373-sdw.c

+1 −14
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static const struct dev_pm_ops max98373_pm = { 
static int max98373_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i, num_of_ports;

	int nval, i;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -295,7 +295,6 @@ static int max98373_read_prop(struct sdw_slave *slave) 
	prop->clk_stop_timeout = 20;



	nval = hweight32(prop->source_ports);

	num_of_ports = nval;

	prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,

					  sizeof(*prop->src_dpn_prop),

					  GFP_KERNEL);
@@ -315,7 +314,6 @@ static int max98373_read_prop(struct sdw_slave *slave) 


	/* do this again for sink now */

	nval = hweight32(prop->sink_ports);

	num_of_ports += nval;

	prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,

					   sizeof(*prop->sink_dpn_prop),

					   GFP_KERNEL);
@@ -333,17 +331,6 @@ static int max98373_read_prop(struct sdw_slave *slave) 
		i++;

	}



	/* Allocate port_ready based on num_of_ports */

	slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,

					 sizeof(*slave->port_ready),

					 GFP_KERNEL);

	if (!slave->port_ready)

		return -ENOMEM;



	/* Initialize completion */

	for (i = 0; i < num_of_ports; i++)

		init_completion(&slave->port_ready[i]);



	/* set the timeout values */

	prop->clk_stop_timeout = 20;

sound/soc/codecs/rt1308-sdw.c

+1 −13
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int rt1308_clock_config(struct device *dev) 
static int rt1308_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i, num_of_ports = 1;

	int nval, i;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -131,7 +131,6 @@ static int rt1308_read_prop(struct sdw_slave *slave) 


	/* for sink */

	nval = hweight32(prop->sink_ports);

	num_of_ports += nval;

	prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,

						sizeof(*prop->sink_dpn_prop),

						GFP_KERNEL);
@@ -149,17 +148,6 @@ static int rt1308_read_prop(struct sdw_slave *slave) 
		i++;

	}



	/* Allocate port_ready based on num_of_ports */

	slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,

					sizeof(*slave->port_ready),

					GFP_KERNEL);

	if (!slave->port_ready)

		return -ENOMEM;



	/* Initialize completion */

	for (i = 0; i < num_of_ports; i++)

		init_completion(&slave->port_ready[i]);



	/* set the timeout values */

	prop->clk_stop_timeout = 20;

sound/soc/codecs/rt5682-sdw.c

+1 −14
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static int rt5682_update_status(struct sdw_slave *slave, 
static int rt5682_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i, num_of_ports = 1;

	int nval, i;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -549,7 +549,6 @@ static int rt5682_read_prop(struct sdw_slave *slave) 
	prop->sink_ports = 0x2;		/* BITMAP: 00000010 */



	nval = hweight32(prop->source_ports);

	num_of_ports += nval;

	prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,

					  sizeof(*prop->src_dpn_prop),

					  GFP_KERNEL);
@@ -569,7 +568,6 @@ static int rt5682_read_prop(struct sdw_slave *slave) 


	/* do this again for sink now */

	nval = hweight32(prop->sink_ports);

	num_of_ports += nval;

	prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,

					   sizeof(*prop->sink_dpn_prop),

					   GFP_KERNEL);
@@ -587,17 +585,6 @@ static int rt5682_read_prop(struct sdw_slave *slave) 
		i++;

	}



	/* Allocate port_ready based on num_of_ports */

	slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,

					 sizeof(*slave->port_ready),

					 GFP_KERNEL);

	if (!slave->port_ready)

		return -ENOMEM;



	/* Initialize completion */

	for (i = 0; i < num_of_ports; i++)

		init_completion(&slave->port_ready[i]);



	/* set the timeout values */

	prop->clk_stop_timeout = 20;

sound/soc/codecs/rt700-sdw.c

+1 −14
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int rt700_update_status(struct sdw_slave *slave, 
static int rt700_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i, num_of_ports = 1;

	int nval, i;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -345,7 +345,6 @@ static int rt700_read_prop(struct sdw_slave *slave) 
	prop->sink_ports = 0xA; /* BITMAP:  00001010 */



	nval = hweight32(prop->source_ports);

	num_of_ports += nval;

	prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,

						sizeof(*prop->src_dpn_prop),

						GFP_KERNEL);
@@ -365,7 +364,6 @@ static int rt700_read_prop(struct sdw_slave *slave) 


	/* do this again for sink now */

	nval = hweight32(prop->sink_ports);

	num_of_ports += nval;

	prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,

						sizeof(*prop->sink_dpn_prop),

						GFP_KERNEL);
@@ -383,17 +381,6 @@ static int rt700_read_prop(struct sdw_slave *slave) 
		i++;

	}



	/* Allocate port_ready based on num_of_ports */

	slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,

					sizeof(*slave->port_ready),

					GFP_KERNEL);

	if (!slave->port_ready)

		return -ENOMEM;



	/* Initialize completion */

	for (i = 0; i < num_of_ports; i++)

		init_completion(&slave->port_ready[i]);



	/* set the timeout values */

	prop->clk_stop_timeout = 20;

sound/soc/codecs/rt711-sdw.c

+1 −14
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int rt711_update_status(struct sdw_slave *slave, 
static int rt711_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i, num_of_ports = 1;

	int nval, i;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -349,7 +349,6 @@ static int rt711_read_prop(struct sdw_slave *slave) 
	prop->sink_ports = 0x8; /* BITMAP:  00001000 */



	nval = hweight32(prop->source_ports);

	num_of_ports += nval;

	prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,

						sizeof(*prop->src_dpn_prop),

						GFP_KERNEL);
@@ -369,7 +368,6 @@ static int rt711_read_prop(struct sdw_slave *slave) 


	/* do this again for sink now */

	nval = hweight32(prop->sink_ports);

	num_of_ports += nval;

	prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,

						sizeof(*prop->sink_dpn_prop),

						GFP_KERNEL);
@@ -387,17 +385,6 @@ static int rt711_read_prop(struct sdw_slave *slave) 
		i++;

	}



	/* Allocate port_ready based on num_of_ports */

	slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,

					sizeof(*slave->port_ready),

					GFP_KERNEL);

	if (!slave->port_ready)

		return -ENOMEM;



	/* Initialize completion */

	for (i = 0; i < num_of_ports; i++)

		init_completion(&slave->port_ready[i]);



	/* set the timeout values */

	prop->clk_stop_timeout = 20;