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>,
        Simon Horman <simon.horman@corigine.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        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 v3] wifi: ray_cs: Replace the ternary conditional operator with min()
Date:   Tue, 27 Jun 2023 12:31:48 +0800
Message-Id: <20230627043151.19576-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?rLwZAnsI6x91lieS3exwsUFy3bfk3VBVaLGkArWnRNEEjhv1wAY1PDr2FKmB?=
 =?us-ascii?Q?l6POkNWsdI1OM30e40GiEG/Q241MEgtD6+0NHh9na32eI2sncSVKeWxYf3sA?=
 =?us-ascii?Q?JFvxTmTlCzlTujLpWg2xJBQ+onuACpVvRUPnKrNbIjt9gh7/IhW/MoQgLRbP?=
 =?us-ascii?Q?F4IixOAV4of9WL2YTeEifI4PlnarCR0IDfCL9B04OOHPDJ0s58Fvcm4Feawm?=
 =?us-ascii?Q?Pp9Ha5n7isLmTXTJ44eDfJHaYF77Wn1l41AvCAqwfQBMwpNyAnX2cM/G119V?=
 =?us-ascii?Q?N7n+AchPUS3oBZhvTZLG0v8Ew22AvgG/aHr6ynWO7lILjOFuMFxFKfAUBvrr?=
 =?us-ascii?Q?vqspwF2LdsRi+EeocWyjKTLrJRIG+wfI4wbYXR3LE489kXFWptA0bjsdjZ5u?=
 =?us-ascii?Q?CPRGZBw5eJ5Hwz9JqyKvU5fvyeuFXXGY1SQyDrO0/ZNENu/n56DcK8s7k0Pp?=
 =?us-ascii?Q?tyMArNn+k0eGm/mUTpnI5ssZFT7taT+E1amfpSIr1UFUICBs2NyBjqD0CE4o?=
 =?us-ascii?Q?KtPrKIH6A+dE9kkNoD1jLv+YnzHwnyojOSwYhXzNXowltEPOMU0N+hGHbdQ7?=
 =?us-ascii?Q?ksA4Q//zQlC9K2CuBGv+jxOJqCdTWQP26QLoYal3eAZflH1KI+CeVhNRRI0Y?=
 =?us-ascii?Q?oFw70VeJx2JIQt1PiLmrnX+zXTHk89OYlu6TSC9Cn8GM4hVULEauEGuw5yw2?=
 =?us-ascii?Q?RqxZWWnrlIBJDhd7my+2w6Km1sedxYg+vStCzyet3aDzxKCZv0aSCfnOo3D7?=
 =?us-ascii?Q?hueqJpO74xOi3gyhfhBokLoeqjQm4rFTUuXMK5qdLsiR+qgnBS9AmOCvjvOY?=
 =?us-ascii?Q?UZeHlHgrEbxjFOhbVb4iVL6fs8Jvlxi6QQ7CHyIbdxA9WG+vffPjt6T9tjla?=
 =?us-ascii?Q?T0hyWT4AXZM89ET1vV9szOK30iYqWX2fM/hY2SHAtTWeIjgr9CzGI5M+rUbB?=
 =?us-ascii?Q?eH0C6xXeFFCGfj+VZmQEcGSlx44KuaOSqPJkKNCgqGCBQLFj6tv9y9XtiLYl?=
 =?us-ascii?Q?C9z6DadaU9G2OzEy/H0lyfIZEvr2mnFQ05E6pdoCBU/knzS9ZUQKXds4QOKl?=
 =?us-ascii?Q?rmBKaRnR+6zDRZeiiDhZJNSdpoEBvQPw/ZTQx8Bjw1codobcrhzVl1kPVV5R?=
 =?us-ascii?Q?a40CZhhJmK2LHqSBVxsEOg7yojqG6+ed0UncclRZnEZoke+KeVv3JEKsi29v?=
 =?us-ascii?Q?5Ek8QurrsuJnTUd6dyudN9KaMBuxzhC6/s61ZjQBG0nwaEeqBp43LxIb6Mxx?=
 =?us-ascii?Q?03LwKCHhDO+JOlkVJ4YCs40Fx1BOSdhmL0b5YmjmfuCVheLGC7zRokOT1sDs?=
 =?us-ascii?Q?YwhNKzxOIreTU/9Zd8FLypz20V4xLVc6ekPlqQxWE47t7AerxLD2SriZ4k38?=
 =?us-ascii?Q?CtMHCHyBeUKqHGe4fICQ61TVaVkKTFmYh7TjAIJoJy4vFrDCGBY/US+Q8XUt?=
 =?us-ascii?Q?ZQOW0drS1hAEJyDXj8Yqvl0qSX0IX8EjadhoczdN3H77NNUhX/BDN/S1iHwc?=
 =?us-ascii?Q?+PS+q7Di2MaLIYILnBeHqyNsK6yxQqlzNP1qbGGmap4rJcanJfrDN7w6K6Db?=
 =?us-ascii?Q?QPllWOgF2PEA3+5D4TyacfYpnosZnXaaBB3/j9by?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c570b84d-ba9c-472e-140d-08db76c7719a
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 04:31:58.1950
 (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: WjUSo/xjEaDBanG1h8+OdZbYaZKuosR4Cqc6atietp3Ra4YIkAAwE+PVSIud4wTPy57olzwbgEqcFuMrM7Y9fQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6397
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,
        URIBL_BLOCKED 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..25edbc655738 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, rx_len, sizeof(struct beacon_rx));
 
 		local->beacon_rxed = 1;
 		/* Get the statistics so the card counters never overflow */
-- 
2.39.0