Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   You Kangren <youkangren@vivo.com>
To:     Kalle Valo <kvalo@kernel.org>, Dongliang Mu <dzm91@hust.edu.cn>,
        You Kangren <youkangren@vivo.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Simon Horman <simon.horman@corigine.com>,
        linux-wireless@vger.kernel.org (open list:RAYLINK/WEBGEAR 802.11
        WIRELESS LAN DRIVER), linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com
Subject: [PATCH v4] wifi: ray_cs: Replace the ternary conditional operator with min()
Date:   Mon,  3 Jul 2023 19:29:45 +0800
Message-Id: <20230703112950.11854-1-youkangren@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?SzrXtKm+hmzVvWRSZVerFi7abJeu09ms52HP5MnK3fjbWwv/Evu7EBbafYK8?=
 =?us-ascii?Q?VQuI5oc45J3dVz2WgA9hx830hARzSZfnnLZ9/UKVYWcozC/94UDmNfyhJAnS?=
 =?us-ascii?Q?BEqbyiXtNVrhA6ndAkS5i4Hg2xk0ixhtG4ZihnUxCF9lf6vu3jENH8LRwfN6?=
 =?us-ascii?Q?1C8WLbnxHdVde1b6uGyKvrs+PPblesc+rFmVHiM+3KIB/bkD9EOri00ofuXW?=
 =?us-ascii?Q?/VjLZoEwJ6YkR6WmkFJMhELjyorSBQ1r2/WYkYHhdS+R4XZqsyJO0a7dCPh1?=
 =?us-ascii?Q?TgdF1upLtDf9/w9nbYgZM1RU4cc7r0UOvVNVzzrokSPWs2+D5+LhNrYHZ2Uh?=
 =?us-ascii?Q?BIEwTasH/vFWjkqbEvACOCFpdcILZ+dHY8FSneHRouGtZNNvBSInX64WaagW?=
 =?us-ascii?Q?yadXhjL4kPVrmqgVgzdy3UJbW0XDBG+SF6Pli6Tmu7sc7/X+SQtSvVT5b1S1?=
 =?us-ascii?Q?t4QTF7rZWaOj1gGF1YFj8OTdzQZSTClI8oO8HnAFVqKPx+4wynpt9JAnG3wP?=
 =?us-ascii?Q?24R+Grlxum4dH65X9LwbUAGUOzmiZhX2/IhHxPOFmKLSVYO5cAplzGoiSv4d?=
 =?us-ascii?Q?jvkXhLJumrTXn0OgMpLi6QoxhEPX1ALisVxfMQJUxnTGeLWeuSEJgf8oTRTF?=
 =?us-ascii?Q?0yA8FS+9veCAVIKr94nTRr2QzaJdIDd++UUf2zw5ifitldu0XtaFrcMRRVcF?=
 =?us-ascii?Q?vLdxI0/lnYzX3yiAYbTJ+vaa0edNi5F6bfix9a2vZz2Mq2ft471xFp/cO0gA?=
 =?us-ascii?Q?JGsKYcAQaRwJ4dJJ13uwMqLwt2DhsKfHa/RImTFOiJPCzxF+qnlnDvF3eQnS?=
 =?us-ascii?Q?bAZppsx3B7F/bU7AJ6wJkKqg1bRsw1EIDNyL1fBQYK3iLF4k34lfnG3JBIvx?=
 =?us-ascii?Q?oraUVVgUxDLcCZq/2QAhqRprLkCYTTsE5bSIj671lVo5q7XzzwUthr2pWsil?=
 =?us-ascii?Q?K5bhIXC1FUtm8GGDwbvHoE3JkU6xJTjf5iQb5SEzKjKyH7+3Oh2f+3FOLVp4?=
 =?us-ascii?Q?H4fepEKNipVIp5r/fqR0P+BlWk3CrICp5kG5cslwfjqyKABz9ot9EW29qPJQ?=
 =?us-ascii?Q?cclQo+TSHWEm38jSLzLfQ+BG/hMdM6lmh8sIC5hFAXdKCjM5vxKft5BTIh/h?=
 =?us-ascii?Q?LMOkPnyI8EPEVI0ohdcNFzvdUwxSRc5VkX7lE9z/YK51OL+huz5qykNqrMXa?=
 =?us-ascii?Q?0dI3VAGPYD+MqOJqB6NIGhbtqa5u4oAKx8soUwcsD7OzRG7cPPTbe8UfsAKe?=
 =?us-ascii?Q?yVNbS1843c0DaOpucT+qTqaFYosCFx4i9/JXUaI2YgPiabwiOpt6w474ANce?=
 =?us-ascii?Q?AMtcALbCuHE35VmAFQ0fFyMv85ddaJBZZn68Io8bUIXr+jDRa5ctURCuNvVl?=
 =?us-ascii?Q?M7J5vrnEKi9migyZAJxzhqqRCHxFfaZSjGolish9xfBHMF83T2AnsTxL/8es?=
 =?us-ascii?Q?O7vIX5JoLhp7EVLQ/nuuOPlcxJvBEyrC2+NlftinKtMji/IoMXJaOeTSpQuI?=
 =?us-ascii?Q?slCJdsHruePzVhYeGJdplVx8xeN1xEqbC7/a/cpgns2L5wzNZXkvEQBZG5Bd?=
 =?us-ascii?Q?gbnuFCDT89iQi0LSIr4d5z136F20pGgc7d9V/vvr?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f978a12-a6f9-4097-78cc-08db7bb8d240
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 11:29:53.7128
 (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: uTzUEKv8jNhDe7PJtEUlmgrfVX0HLuTlv+HzRn8j0uXAzd4QXuCAhjtl5Lc6AuB5OQaWeqNLYHzgZq4kstn9Hg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6132
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-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Replace the ternary conditional operator with min_t() to simplify the code

Signed-off-by: You Kangren <youkangren@vivo.com>
---
 drivers/net/wireless/legacy/ray_cs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c
index 8ace797ce951..f8c4e9ac7621 100644
--- a/drivers/net/wireless/legacy/ray_cs.c
+++ b/drivers/net/wireless/legacy/ray_cs.c
@@ -2086,8 +2086,7 @@ static void ray_rx(struct net_device *dev, ray_dev_t *local,
 			rx_data(dev, prcs, pkt_addr, rx_len);
 
 		copy_from_rx_buff(local, (UCHAR *) &local->last_bcn, pkt_addr,
-				  rx_len < sizeof(struct beacon_rx) ?
-				  rx_len : sizeof(struct beacon_rx));
+				  min_t(size_t, (size_t)rx_len, sizeof(struct beacon_rx)));
 
 		local->beacon_rxed = 1;
 		/* Get the statistics so the card counters never overflow */
-- 
2.39.0