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;
From:   Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
To:     Xu Wang <vulab@iscas.ac.cn>,
        Support Opensource <Support.Opensource@diasemi.com>,
        "lgirdwood@gmail.com" <lgirdwood@gmail.com>,
        "broonie@kernel.org" <broonie@kernel.org>,
        "perex@perex.cz" <perex@perex.cz>,
        "tiwai@suse.com" <tiwai@suse.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] ASoC: codecs: da*: Remove redundant null check before
 clk_prepare_enable/clk_disable_unprepare
Thread-Topic: [PATCH] ASoC: codecs: da*: Remove redundant null check before
 clk_prepare_enable/clk_disable_unprepare
Thread-Index: AQHW5Zu7Ghmmvn75wEGVXRkKptFq8aodfyaw
Date:   Fri, 8 Jan 2021 10:10:43 +0000
Message-ID: <PR3PR10MB41424697CF78E4F06FF9154480AE0@PR3PR10MB4142.EURPRD10.PROD.OUTLOOK.COM>
References: <20210108085319.6912-1-vulab@iscas.ac.cn>
In-Reply-To: <20210108085319.6912-1-vulab@iscas.ac.cn>
Accept-Language: en-GB, en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [147.161.166.124]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: c1a76525-99e7-45bc-2455-08d8b3bda913
x-ms-traffictypediagnostic: PAXPR10MB4639:
x-ms-exchange-sharedmailbox-routingagent-processed: True
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <PAXPR10MB463940F67823C4FFC858C5A7A7AE0@PAXPR10MB4639.EURPRD10.PROD.OUTLOOK.COM>
x-ms-oob-tlc-oobclassifiers: OLM:2043;
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: JjIUzr54ydtLx97eCPc0jLRwu6APrihzxMpxZr68NxNFlgLc5fvYsThVn8GmKCcHhdywRQy8DqX08cK7Y+I0d1fQQWukfR9E/Fn2RMYfGM+zZY5KoarwROwJgPaY9/e2Fj+z8En/yHX6dtWllNZSKMn5+KN+DQ+SjCWD3/Zyi5NndaI+ZKDqX+OWjjPSA8wBe7hK9Z74nEvyzA+sbhGQ9eaJLSQy58bycAKL8fc+PxQtSzLZxF7458xkhR3+XMGWNR/GP41NRHcKpK56uLJb97fvW+kwcTIkzvjjln/sTpBoDQ3LUmBVBW80kYMknVJJejgiZu4zgmrQ+6VMfPE+cx7GEFaxHomxytpuzu0LEhQ69n0rhYcT2+80bADFB3PB2xYQNBNG1Sxh8/dZecG3zw==
x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PR3PR10MB4142.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(478600001)(66476007)(5660300002)(86362001)(8676002)(53546011)(83380400001)(4326008)(8936002)(66446008)(7696005)(6506007)(33656002)(66556008)(316002)(110136005)(52536014)(64756008)(9686003)(55016002)(186003)(66946007)(71200400001)(2906002)(76116006)(26005);DIR:OUT;SFP:1101;
x-ms-exchange-antispam-messagedata: =?us-ascii?Q?akD33bSiFx+YsbGUVGsxfmf92r1k3mUrEddO4/jzYzJhujQqtp/7CBHD6m4Q?=
 =?us-ascii?Q?bHJ2EUY2q/Y9WTV3RRdhSsi6cPm3upTiRBfG/8wMjhOQWRV982T8XuQpYGWT?=
 =?us-ascii?Q?uL5MBHxRPpHr+ubTb6bCk4eWjCBtnZa42aTBPZuNZ5dd4BTBO3kAbmp6gZRd?=
 =?us-ascii?Q?F0FoVw1ioq5crnkRjxbRE/J4gYpXCMCJ4muqcPiNcZ/ljR60Fx++hvuT9som?=
 =?us-ascii?Q?a/twTTY1/wKVtSOX3p6WS806QAic6pIpSMJAUsq16eduF10xJaub7ka9uaoB?=
 =?us-ascii?Q?oCbfGNzvFH1qcteBUEMTUXuMmBNKHZwoQjEQZmxyn9HnynLxQ0mU9k1gbytv?=
 =?us-ascii?Q?PQxtzXfBAtWEuWv4k+V/wdrVU03mZ4SrafdNKPT/LEVgX6rM5E0iyZHIyZW1?=
 =?us-ascii?Q?1tCxLaKtZkI+CKpfWpFpem1nzZQDERTTWPkrpHLmB1z3ogEGX2Pt6QlGCOHN?=
 =?us-ascii?Q?cNjdmg08CEqidrfy5KJNQr7kybCsF93oN8oTg5imH0AIlRKQ9OwWpOmMkLJW?=
 =?us-ascii?Q?sUCMrX/Oo7DOjmQ+SrzScx16+SyEFO+Y5HQWQEWtELVB4UgGmvgVsT7KSQAV?=
 =?us-ascii?Q?/uwZnvMta9HGhRooV84nj2sGifKAY5oknjzqa7hMYcnpfuNGy/fZf9iq5/FR?=
 =?us-ascii?Q?dIiGjc6gqltXhY2bVsbwSQa3R1cPDfoHX1Z8CmBHbFmd8tUPSJn8u2FxWFtO?=
 =?us-ascii?Q?iS0hwQgKnM2YJ20wvTfuh616lplHDi8d97eG+BuDDZ+z4n5oK3s/Ir6+9Dzh?=
 =?us-ascii?Q?hodZ5rTWftXjbvXvV+HUaizpjbvm2sligZ+iu0vzBQjyrZYhnsXCM9J8iCft?=
 =?us-ascii?Q?yiQtUC2QuHd1ARx2h0RJhZqmLZHhr0BsomMGWg3zSjjh/ikEvknUsV88PvXi?=
 =?us-ascii?Q?pNQ2DUHFrzfORyogKv3RY/R+JXWRjeJeCVQJrnVURMiicuCFCUdGN/q/jhsK?=
 =?us-ascii?Q?yBN6KA42q8iMEsJ4Y2zjmC0CxuP0Do4kR58rOKSB6wA=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: diasemi.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB4142.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: c1a76525-99e7-45bc-2455-08d8b3bda913
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2021 10:10:43.8863
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 511e3c0e-ee96-486e-a2ec-e272ffa37b7c
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 6mxzn7lXbBF3mUic5GjCPzXsEE9x20t2qtdlWQbMxB8WW2X9mO+OGZgHWgh+A6I4BkdDMzk+UnUrFl1rrT+IGi558peLnvN0lr0/Mxf8mkg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4639
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 08 January 2021 08:53, Xu Wang wrote:

> Because clk_prepare_enable() and clk_disable_unprepare() already checked
> NULL clock parameter, so the additional checks are unnecessary, just
> remove them.
>=20
> Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
> ---
>  sound/soc/codecs/da7218.c     | 13 +++++--------
>  sound/soc/codecs/da7219-aad.c | 19 ++++++++-----------
>  sound/soc/codecs/da7219.c     |  3 +--
>  3 files changed, 14 insertions(+), 21 deletions(-)
>=20
> diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c
> index 2bfafbe9e3dc..324d95e3b48a 100644
> --- a/sound/soc/codecs/da7218.c
> +++ b/sound/soc/codecs/da7218.c
> @@ -2582,12 +2582,10 @@ static int da7218_set_bias_level(struct
> snd_soc_component *component,
>  	case SND_SOC_BIAS_PREPARE:
>  		/* Enable MCLK for transition to ON state */
>  		if (snd_soc_component_get_bias_level(component) =3D=3D
> SND_SOC_BIAS_STANDBY) {
> -			if (da7218->mclk) {
> -				ret =3D clk_prepare_enable(da7218->mclk);
> -				if (ret) {
> -					dev_err(component->dev, "Failed to
> enable mclk\n");
> -					return ret;
> -				}
> +			ret =3D clk_prepare_enable(da7218->mclk);
> +			if (ret) {
> +				dev_err(component->dev, "Failed to enable
> mclk\n");
> +				return ret;
>  			}
>  		}
>=20
> @@ -2605,8 +2603,7 @@ static int da7218_set_bias_level(struct
> snd_soc_component *component,
>  					    DA7218_LDO_EN_MASK);
>  		} else {
>  			/* Remove MCLK */
> -			if (da7218->mclk)
> -				clk_disable_unprepare(da7218->mclk);
> +			clk_disable_unprepare(da7218->mclk);
>  		}
>  		break;
>  	case SND_SOC_BIAS_OFF:
> diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.=
c
> index 48081d71c22c..fa61cfc8e50c 100644
> --- a/sound/soc/codecs/da7219-aad.c
> +++ b/sound/soc/codecs/da7219-aad.c
> @@ -123,15 +123,13 @@ static void da7219_aad_hptest_work(struct work_stru=
ct
> *work)
>  	mutex_lock(&da7219->pll_lock);
>=20
>  	/* Ensure MCLK is available for HP test procedure */
> -	if (da7219->mclk) {
> -		ret =3D clk_prepare_enable(da7219->mclk);
> -		if (ret) {
> -			dev_err(component->dev, "Failed to enable mclk -
> %d\n", ret);
> -			mutex_unlock(&da7219->pll_lock);
> -			mutex_unlock(&da7219->ctrl_lock);
> -			snd_soc_dapm_mutex_unlock(dapm);
> -			return;
> -		}
> +	ret =3D clk_prepare_enable(da7219->mclk);
> +	if (ret) {
> +		dev_err(component->dev, "Failed to enable mclk - %d\n", ret);
> +		mutex_unlock(&da7219->pll_lock);
> +		mutex_unlock(&da7219->ctrl_lock);
> +		snd_soc_dapm_mutex_unlock(dapm);
> +		return;
>  	}
>=20
>  	/*
> @@ -318,8 +316,7 @@ static void da7219_aad_hptest_work(struct work_struct
> *work)
>  		da7219_set_pll(component, DA7219_SYSCLK_MCLK, 0);
>=20
>  	/* Remove MCLK, if previously enabled */
> -	if (da7219->mclk)
> -		clk_disable_unprepare(da7219->mclk);
> +	clk_disable_unprepare(da7219->mclk);
>=20
>  	mutex_unlock(&da7219->pll_lock);
>  	mutex_unlock(&da7219->ctrl_lock);
> diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
> index e9b45daec0ca..50307cc9d640 100644
> --- a/sound/soc/codecs/da7219.c
> +++ b/sound/soc/codecs/da7219.c
> @@ -1826,8 +1826,7 @@ static int da7219_set_bias_level(struct
> snd_soc_component *component,
>=20
>  		if (snd_soc_component_get_bias_level(component) =3D=3D
> SND_SOC_BIAS_PREPARE) {
>  			/* Remove MCLK */
> -			if (da7219->mclk)
> -				clk_disable_unprepare(da7219->mclk);
> +			clk_disable_unprepare(da7219->mclk);

You seem to have missed the change for clk_prepare_enable() usage in the
same function. Also as the above is now a single line if statement, you can
remove the brackets.

In addition, the normal approach would be to split the changes into separat=
e
patches per driver, just so it's cleaner.

>  		}
>  		break;
>  	case SND_SOC_BIAS_OFF:
> --
> 2.17.1