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>,
        Simon Horman <simon.horman@corigine.com>,
        You Kangren <youkangren@vivo.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] wifi: ray_cs: Replace the ternary conditional operator with min()
Date:   Mon, 26 Jun 2023 17:35:02 +0800
Message-Id: <20230626093504.1325-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?a/1tgPT4NXIQAhEQemcoWj3e6Ce/BTCTWxB+OoYNcMcqMOy70pFZ5SwiYuUy?=
 =?us-ascii?Q?neUJ5IKLajCH2ftNCLand2Dv2pNXosrgNz64KDggLFHVh876YyS1Qr+bZxuq?=
 =?us-ascii?Q?2RLsp2nUKVvXqBP1hWjiLQTCo62CjSXZBVkWY1/+voyy/f8CAjT6OWBKVOx8?=
 =?us-ascii?Q?KVrUQ1x9pv/g0375MRJdoq+dKep5kCrLE82RiEgzMp1OONzvGW+rasZwNeXa?=
 =?us-ascii?Q?q7DQWiL5/MDL4hd2b+nFDkhUOj2O0we64zQVh8AZZnVnC7RcsQ3SCChntYzm?=
 =?us-ascii?Q?Ja393Z6u5w1l5/KqrDMaUgEmGK4s1+OEoJVLcuxrgU9eo2UCuR4UhMEwdi8T?=
 =?us-ascii?Q?rB5ySWH/Tfs0CEYpCvoRb5NjO7YxR7K4w4fSW63aP+bW6tULkCRT1z1dGhTo?=
 =?us-ascii?Q?Ryk+t1k5KEZTTE3MMNUR5dXrsmKaj2Vj+CsN1cFxjoOSviu4gI+MswsFILdW?=
 =?us-ascii?Q?qF6WrVf3EjmY7JROSd0gECykva2r/KiPw5tND++2MNEbP8FBWFO/U6BX0BLu?=
 =?us-ascii?Q?c1d/K/22e4/WKam7t0oQay2r4Aav2MYi4J/uJVLzRfu0xfNQjA5gjhpMRd6/?=
 =?us-ascii?Q?5tjpViOM+mfHNWU0fvA7wBiocM8zko7jyCTiYJ+r1d3QFqdDg+sh1RWoq2k5?=
 =?us-ascii?Q?nn7E+zhGQyllqp5ANvzpEtOR1dat78GO8Sjv5s4Ex8wVqJup4aFdCzJ5pojM?=
 =?us-ascii?Q?oqO+OWO2RlyPEU5A6rzJ5i/emZgBlAqVw+UFliii/cWkjr62TvFX5oBTwaQO?=
 =?us-ascii?Q?srDmwy3r+wAdT1KzeBb7kCUq/pyw9YFdtDO68+B1rv0Lsbr0IQ8CvShupj/Q?=
 =?us-ascii?Q?DDkfpJM0h74VBfQR2ys7W+jTwkfP5/6rsgg0ZyJ/4DkKt45H6foSJhzVwk/4?=
 =?us-ascii?Q?7X6tzPFQRLJmeiWf/NhgpkcikJXvvTS+C2kG9zvOJGwhWSBQQprPpD+Wrw63?=
 =?us-ascii?Q?Lr3d3apCuWb+V2X3Fw8M5brrxLJ5edWYb1tJeiIfyYIYsy7bdHzBeD1ly3pJ?=
 =?us-ascii?Q?tuM5Z40+vKEnnFwY0T4wDK6eXJCb7nMn0UD8kfIR8zJpDYiYuFjvT+1ZLjFy?=
 =?us-ascii?Q?xsG7bIxpRQcEn7ofgfinxfGGBnThhuibGhDhjMLqxLrScAkNo+dRc4XAIdRQ?=
 =?us-ascii?Q?hYyFLGrSzrS1aiy+R6AmZ49vtRM7t6OBXer78rpilBaEXeIhRUzeQagvOS9F?=
 =?us-ascii?Q?Rtq1XkR2ODYFmIoXlskNB2ZFahxnR+3OFEuyeBhNFVjGII3B7Meno+KwBEEv?=
 =?us-ascii?Q?Tg27OJKa8d03+N5UHN7sZKk+sedlC+8OsvWigZMXFlDIqXE+R8f88iMSWDo7?=
 =?us-ascii?Q?QTjMUX2hOk7SyD/qnhJ2482mG3/YjssgUAvC9suVjd0+V6WnSyem63dL0J7K?=
 =?us-ascii?Q?At24cN94ZBYPcmJ/J6eA4eN5IZyAHF3rckhspTUuDP7McIszKayA9kHbJYPB?=
 =?us-ascii?Q?JOS2MZoHCSGido84CwJZSHLkN5L+N0THLzm89Np0QFNgLbh4L7pdloCl5Sc7?=
 =?us-ascii?Q?GhKFGTChFHOSxjSplAbTs55kiG6pxuCo8JXYsUicTEJpvZrQgaWA6c5M2EkN?=
 =?us-ascii?Q?1ftuNDHNvDqFI/5I+bEdhGr429EjVCxg2MmQPkBO?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e2d61aeb-2a3a-469b-9fde-08db7628a2a6
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 09:35:10.4967
 (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: Hl/mfDlm+sPOsOlbKWP9uR3Zafb77N5GTq4pNISZDh9LFSsA3JDiunxv5CoKzxyk76/emooDZYmKIDmKqPwlUA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4323
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() to make the code clean

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..96f34d90f601 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(rx_len, sizeof(struct beacon_rx));
 
 		local->beacon_rxed = 1;
 		/* Get the statistics so the card counters never overflow */
-- 
2.39.0