Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: 9pON+FeizFqaHixN3q/o0CszJL6wj3hrPrsFhhZawJvurLG2ET/TdfRkG0mBIZb8f32HbLByjY
 uZGZJLJTlitw==
IronPort-SDR: R8VesFVq3Qh+UJmPUUScci+Do93Sh/VBMvtkO6oJD3WWCbHIJ/KN2JGiwNgE8L52MRbeB6L9Kq
 Pusemo5ezzIA==
From:   "Liao, Bard" <bard.liao@intel.com>
To:     Bard Liao <yung-chuan.liao@linux.intel.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        "vkoul@kernel.org" <vkoul@kernel.org>
CC:     "vinod.koul@linaro.org" <vinod.koul@linaro.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "tiwai@suse.de" <tiwai@suse.de>,
        "broonie@kernel.org" <broonie@kernel.org>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "jank@cadence.com" <jank@cadence.com>,
        "srinivas.kandagatla@linaro.org" <srinivas.kandagatla@linaro.org>,
        "rander.wang@linux.intel.com" <rander.wang@linux.intel.com>,
        "ranjani.sridharan@linux.intel.com" 
        <ranjani.sridharan@linux.intel.com>,
        "hui.wang@canonical.com" <hui.wang@canonical.com>,
        "pierre-louis.bossart@linux.intel.com" 
        <pierre-louis.bossart@linux.intel.com>,
        "Kale, Sanyog R" <sanyog.r.kale@intel.com>,
        "Lin, Mengdong" <mengdong.lin@intel.com>
Subject: RE: [PATCH v2 3/3] ASoC: codecs: fix port_ready[] dynamic allocation
 in ASoC codecs
Thread-Topic: [PATCH v2 3/3] ASoC: codecs: fix port_ready[] dynamic allocation
 in ASoC codecs
Thread-Index: AQHWd4M3yXBG15jxxU2RZvDlHyLQ/6lNOEVA
Date:   Fri, 28 Aug 2020 08:24:19 +0000
Message-ID: <DM6PR11MB40746716F856166D61EE573CFF520@DM6PR11MB4074.namprd11.prod.outlook.com>
References: <20200820182639.11572-1-yung-chuan.liao@linux.intel.com>
 <20200820182639.11572-4-yung-chuan.liao@linux.intel.com>
In-Reply-To: <20200820182639.11572-4-yung-chuan.liao@linux.intel.com>
Accept-Language: en-US
Content-Language: en-US
dlp-version: 11.5.1.3
dlp-reaction: no-action
dlp-product: dlpe-windows
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d1e1f79d-1680-4a31-9b2f-08d84b2bc2b4
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Aug 2020 08:24:19.3279
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7VY5DhWidxumoEWMxvJHDt1Ia+vs7mS9pKcgkXakCQuBAGrKI0E20qWGzOZWtYuWzb/B1YzEakF0ALlMDrbBsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4692
X-OriginatorOrg: intel.com
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Mark,

> -----Original Message-----
> From: Bard Liao <yung-chuan.liao@linux.intel.com>
> Sent: Friday, August 21, 2020 2:27 AM
> To: alsa-devel@alsa-project.org; vkoul@kernel.org
> Cc: vinod.koul@linaro.org; linux-kernel@vger.kernel.org; tiwai@suse.de;
> broonie@kernel.org; gregkh@linuxfoundation.org; jank@cadence.com;
> srinivas.kandagatla@linaro.org; rander.wang@linux.intel.com;
> ranjani.sridharan@linux.intel.com; hui.wang@canonical.com; pierre-
> louis.bossart@linux.intel.com; Kale, Sanyog R <sanyog.r.kale@intel.com>; =
Lin,
> Mengdong <mengdong.lin@intel.com>; Liao, Bard <bard.liao@intel.com>
> Subject: [PATCH v2 3/3] ASoC: codecs: fix port_ready[] dynamic allocation=
 in
> ASoC codecs
>=20
> From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
>=20
> As port_ready is now changed to a fixed array in sdw.h, we can't dynamic
> allocate it in codec drivers.
>=20
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com=
>
> Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com=
>
> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> ---
>  sound/soc/codecs/max98373-sdw.c | 15 +--------------
>  sound/soc/codecs/rt1308-sdw.c   | 14 +-------------
>  sound/soc/codecs/rt5682-sdw.c   | 15 +--------------
>  sound/soc/codecs/rt700-sdw.c    | 15 +--------------
>  sound/soc/codecs/rt711-sdw.c    | 15 +--------------
>  sound/soc/codecs/rt715-sdw.c    | 33 +--------------------------------
>  6 files changed, 6 insertions(+), 101 deletions(-)

Sorry to ping you, but the patch is really easy to be ignored since I
forget to add ASoC prefix  in the cover letter.
Could you Ack it if it looks good to you, please?


>=20
> diff --git a/sound/soc/codecs/max98373-sdw.c
> b/sound/soc/codecs/max98373-sdw.c index 5fe724728e84..a3ec92775ea7
> 100644
> --- a/sound/soc/codecs/max98373-sdw.c
> +++ b/sound/soc/codecs/max98373-sdw.c
> @@ -282,7 +282,7 @@ static const struct dev_pm_ops max98373_pm =3D
> {  static int max98373_read_prop(struct sdw_slave *slave)  {
>  	struct sdw_slave_prop *prop =3D &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 =3D 20;
>=20
>  	nval =3D hweight32(prop->source_ports);
> -	num_of_ports =3D nval;
>  	prop->src_dpn_prop =3D 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)
>=20
>  	/* do this again for sink now */
>  	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
>  	prop->sink_dpn_prop =3D 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++;
>  	}
>=20
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					 sizeof(*slave->port_ready),
> -					 GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.=
c
> index b0ba0d2acbdd..09c69dbab12a 100644
> --- a/sound/soc/codecs/rt1308-sdw.c
> +++ b/sound/soc/codecs/rt1308-sdw.c
> @@ -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 =3D &slave->prop;
> -	int nval, i, num_of_ports =3D 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)
>=20
>  	/* for sink */
>  	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
>  	prop->sink_dpn_prop =3D 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++;
>  	}
>=20
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					sizeof(*slave->port_ready),
> -					GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.=
c
> index 94bf6bee78e6..b7c97aba7f17 100644
> --- a/sound/soc/codecs/rt5682-sdw.c
> +++ b/sound/soc/codecs/rt5682-sdw.c
> @@ -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 =3D &slave->prop;
> -	int nval, i, num_of_ports =3D 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 =3D 0x2;		/* BITMAP: 00000010 */
>=20
>  	nval =3D hweight32(prop->source_ports);
> -	num_of_ports +=3D nval;
>  	prop->src_dpn_prop =3D 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)
>=20
>  	/* do this again for sink now */
>  	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
>  	prop->sink_dpn_prop =3D 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++;
>  	}
>=20
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					 sizeof(*slave->port_ready),
> -					 GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
> index 4d14048d1197..b19fbcc12c69 100644
> --- a/sound/soc/codecs/rt700-sdw.c
> +++ b/sound/soc/codecs/rt700-sdw.c
> @@ -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 =3D &slave->prop;
> -	int nval, i, num_of_ports =3D 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 =3D 0xA; /* BITMAP:  00001010 */
>=20
>  	nval =3D hweight32(prop->source_ports);
> -	num_of_ports +=3D nval;
>  	prop->src_dpn_prop =3D 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)
>=20
>  	/* do this again for sink now */
>  	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
>  	prop->sink_dpn_prop =3D 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++;
>  	}
>=20
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					sizeof(*slave->port_ready),
> -					GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
> index 45b928954b58..dc4a2b482462 100644
> --- a/sound/soc/codecs/rt711-sdw.c
> +++ b/sound/soc/codecs/rt711-sdw.c
> @@ -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 =3D &slave->prop;
> -	int nval, i, num_of_ports =3D 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 =3D 0x8; /* BITMAP:  00001000 */
>=20
>  	nval =3D hweight32(prop->source_ports);
> -	num_of_ports +=3D nval;
>  	prop->src_dpn_prop =3D 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)
>=20
>  	/* do this again for sink now */
>  	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
>  	prop->sink_dpn_prop =3D 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++;
>  	}
>=20
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					sizeof(*slave->port_ready),
> -					GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
> index d11b23d6b240..d8ed07305ffc 100644
> --- a/sound/soc/codecs/rt715-sdw.c
> +++ b/sound/soc/codecs/rt715-sdw.c
> @@ -431,7 +431,7 @@ static int rt715_update_status(struct sdw_slave
> *slave,  static int rt715_read_prop(struct sdw_slave *slave)  {
>  	struct sdw_slave_prop *prop =3D &slave->prop;
> -	int nval, i, num_of_ports =3D 1;
> +	int nval, i;
>  	u32 bit;
>  	unsigned long addr;
>  	struct sdw_dpn_prop *dpn;
> @@ -443,7 +443,6 @@ static int rt715_read_prop(struct sdw_slave *slave)
>  	prop->sink_ports =3D 0x0;	/* BITMAP:  00000000 */
>=20
>  	nval =3D hweight32(prop->source_ports);
> -	num_of_ports +=3D nval;
>  	prop->src_dpn_prop =3D devm_kcalloc(&slave->dev, nval,
>  					sizeof(*prop->src_dpn_prop),
>  					GFP_KERNEL);
> @@ -460,36 +459,6 @@ static int rt715_read_prop(struct sdw_slave *slave)
>  		i++;
>  	}
>=20
> -	/* do this again for sink now */
> -	nval =3D hweight32(prop->sink_ports);
> -	num_of_ports +=3D nval;
> -	prop->sink_dpn_prop =3D devm_kcalloc(&slave->dev, nval,
> -					sizeof(*prop->sink_dpn_prop),
> -					GFP_KERNEL);
> -	if (!prop->sink_dpn_prop)
> -		return -ENOMEM;
> -
> -	dpn =3D prop->sink_dpn_prop;
> -	i =3D 0;
> -	addr =3D prop->sink_ports;
> -	for_each_set_bit(bit, &addr, 32) {
> -		dpn[i].num =3D bit;
> -		dpn[i].simple_ch_prep_sm =3D true;
> -		dpn[i].ch_prep_timeout =3D 10;
> -		i++;
> -	}
> -
> -	/* Allocate port_ready based on num_of_ports */
> -	slave->port_ready =3D devm_kcalloc(&slave->dev, num_of_ports,
> -					sizeof(*slave->port_ready),
> -					GFP_KERNEL);
> -	if (!slave->port_ready)
> -		return -ENOMEM;
> -
> -	/* Initialize completion */
> -	for (i =3D 0; i < num_of_ports; i++)
> -		init_completion(&slave->port_ready[i]);
> -
>  	/* set the timeout values */
>  	prop->clk_stop_timeout =3D 20;
>=20
> --
> 2.17.1