Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Li Dong <lidong@vivo.com>
To:     Walker Chen <walker.chen@starfivetech.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>,
        alsa-devel@alsa-project.org (moderated list:SOUND - SOC LAYER / DYNAMIC
        AUDIO POWER MANAGEM...), linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, lidong@vivo.com
Subject: [PATCH] sound: Fix traditional comparison using max/min method
Date:   Mon, 19 Jun 2023 18:00:37 +0800
Message-Id: <20230619100055.1680-1-lidong@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4uVwT3Ik9ku4aiabFevSy38nM7bUg9qc5GUDb0JHDJ1XFu7ztVnflDJT9SxD?=
 =?us-ascii?Q?fQgpX9rCfAL1iPzAZSDtrmoQm+pb2Y4RTD1EqA7ogurSGx2lobVQI3Q7SXdc?=
 =?us-ascii?Q?F0p0+gk+vVH+VLTtBY0EuUvwVEW0Se3oN9b+lDKLXRLYcaGhCoMVMEkXGqHl?=
 =?us-ascii?Q?AngPVgL9LNpKOmPTN5fozYBoV2NWP/PYHpYpfM3TgolwUBZd5pGGLLtHfS5Z?=
 =?us-ascii?Q?wBNYsen2csbNIXxyW0rHtCYTTSyXVxHrIKQN+7UA3FtnSr1Q+u1TMZo6KsKT?=
 =?us-ascii?Q?hRPlnPy+Xvc29vPIE6Zdv1mWBOWxpC4gpLfDDRqzKKH0h4WrSfeP/iBwxg2g?=
 =?us-ascii?Q?59XUWd138SdZbkmYAiKSU9wSk9VjQ83Zt2dqWhsHfbU5CCyDVWeUCOCggqe8?=
 =?us-ascii?Q?SIL0uksLqK0JlOFuMFS0lavUB8fkTSPuFl6gj+FNXDlMSWVBuH34Q6V16NOV?=
 =?us-ascii?Q?cHmMyi9cVG/SJYcvuBXWS+QjcIMi8G+/01QsJaviITVQaqV+fkFvtMrgsI7i?=
 =?us-ascii?Q?PHLSuFjjeso/rU3rgD/GAxNUOB/dFozkabNzmy6OPAuO3ba1fX04badi1ZQp?=
 =?us-ascii?Q?OvrPWVNg3R7Wt9+AZQ1/YIH4IsAOeyq1h61Rjsi2c3bmmVKFWji7D5ojcHku?=
 =?us-ascii?Q?onB//u/7FwLNrP7+I9S9tB+Q5Tawqs5nREu21ctYRCGs+f4PcnJQ/CPP3+/k?=
 =?us-ascii?Q?0CefdxBoJbLMiU21VvbU+CcuNCXgsT/CJNT6/cxegH4C9QR5btvblIuXaKiR?=
 =?us-ascii?Q?eaeR0PN2qYbaFB50gUiNn4hVL7W/3rvyROfcYULIiSwiJnnZWaQt08eNIW54?=
 =?us-ascii?Q?mGkvsjoFLbBeJH2zg9zDbuCOoKF64rCV3AlTDp/B20J7bPv33MHTWTN4T990?=
 =?us-ascii?Q?i1UlTQBkxqoAg30LEwPzw/Tm0VWl21s/I5GIcEPEynond1giv7KEfYYidC6U?=
 =?us-ascii?Q?vA8HUgTI19nWwc0mj1s1+CJM5Q/lmtKL9urZiWzLLJNRMJH+nNHHC4de1Xzt?=
 =?us-ascii?Q?jpV6FbK/vLM60mYAtmBhYGAqxU4e2U2nAUAyveED6UAQYH34SG11RSWeTkUg?=
 =?us-ascii?Q?npntvImtZJYoqb927VKCl0f+uO4Z9q+V6FXUvOF/xTVYEVwEoiPgS/oSh/AS?=
 =?us-ascii?Q?y5Qmgx7sMe5QKKXfUlIBMzG29P1DPLvznvPcpLiW1BGY8U5itnHJh3soJt+g?=
 =?us-ascii?Q?Aep2DR8G2xw0Pdhal8+HZRRIrzNVu7InJNwr53wWsXoUpvmTjRi1F597uO+u?=
 =?us-ascii?Q?RUwKEkZp0dQ34/irenRFCRa/76yAunTSnL6Qveomm3vVKreLdy9ZSErj+tGI?=
 =?us-ascii?Q?lYloGhHg6/FcvY6y/z6fiPaQPWZiAb1Wcrk22noc29ss03I7FqVaREt8bAPP?=
 =?us-ascii?Q?Yu1wRr0yZy06J9bxPsVSRi1FqA6GNWV6HpaGxRljiEYFUZXDKJ6qeMzGRosJ?=
 =?us-ascii?Q?I2D/JB6H8XRoPCNFgCPx9riQCVDBJibEdRuBd/xVEj7RU1ZD/PuzH1xukMcv?=
 =?us-ascii?Q?Wc80SM+wdmf7qoOkTwHuHIKm4NYl2/DhpToJyrs7gT+JqD6U9Rqyd+EefRRg?=
 =?us-ascii?Q?YK65LG8048QUN17UTyqDJSJcFCa2b6HHSMKh0fTl?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e3b7d9e8-c911-4048-725f-08db70ac3083
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5022.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 10:01:45.6864
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HH5Qer7rRfgxvf8WqnKS7VJR6X2wkfK9fN1ZE/jHMcK4L4f4MJw7ezo8aM58KaM5qOFUHHpw49f+6cCJhD4rQw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6763
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It would be better to replace the traditional ternary conditional
operator with max()/min()

Signed-off-by: Li Dong <lidong@vivo.com>
---
 sound/soc/starfive/jh7110_tdm.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c
index 5f5a6ca7dbda..a17437dd8c3e 100644
--- a/sound/soc/starfive/jh7110_tdm.c
+++ b/sound/soc/starfive/jh7110_tdm.c
@@ -187,15 +187,8 @@ static int jh7110_tdm_syncdiv(struct jh7110_tdm_dev *tdm)
 {
 	u32 sl, sscale, syncdiv;
 
-	if (tdm->rx.sl >= tdm->tx.sl)
-		sl = tdm->rx.sl;
-	else
-		sl = tdm->tx.sl;
-
-	if (tdm->rx.sscale >= tdm->tx.sscale)
-		sscale = tdm->rx.sscale;
-	else
-		sscale = tdm->tx.sscale;
+	sl = max(tdm->rx.sl, tdm->tx.sl);
+	sscale = max(tdm->rx.sscale, tdm->tx.sscale);
 
 	syncdiv = tdm->pcmclk / tdm->samplerate - 1;
 
-- 
2.31.1.windows.1