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 v2] wifi: ray_cs: Replace the ternary conditional operator with min()
Date:   Tue, 27 Jun 2023 09:21:26 +0800
Message-Id: <20230627012129.4066-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?UGxwCrna8XAdpYrrDq+sO2pxMB1o99o8LfQkKj/XqejRnfbA2V5L2JFExLlv?=
 =?us-ascii?Q?8f5KJ7nnzGL0k6UisNehfnjyQZoVUXhkqtA+q5mBUIZWUtuYOHNBVt9308Lb?=
 =?us-ascii?Q?kxazB7cFgei2BuP8T5bBHSAz9N4+0N6EuBYFDJWDU9M8IY8Agp1nCfhPssKs?=
 =?us-ascii?Q?cxGvQbyPc3IjPfr2+u/2UGeL2LJ/EB+d4r1L9njkVaw+1MDROf8JVgNAIjGc?=
 =?us-ascii?Q?kH5YVlI2BulrJE9tLljHM1ISHUWPPg9aVsb1eXPte7GvEKsXbSbF9eiDzcHQ?=
 =?us-ascii?Q?C6inVjJ+QuqVumFMiCYQykr0u2FBT5h1G2GZzx4NtYwj99KN1YxsQTwt9Pgc?=
 =?us-ascii?Q?jWb7aHp3T5aVuQhFXYZrvSfKPDzew6ggQ54pyB6e0gvlOVksbxJ0wof5ntW8?=
 =?us-ascii?Q?pO2Ngw7dmarN5nKoKGK8NKm0JtdLVp4QpHvIW2L5A5r+hNrboyLhISRX44G1?=
 =?us-ascii?Q?NtVRJLj0OiOubMSN39uVnDu1TtPl0owTDClH/+8TnVekr/CarRJrpklro8gV?=
 =?us-ascii?Q?8xuHxJOePSqQuZTccYmY45NDG1c9UGm+xQxPVt85gjBq3JYXdYhgbqIE7W9v?=
 =?us-ascii?Q?qBclQoUcuOq04hX6HjZNwmL9wH9T/4K80TRjNz2yGz8ECkGo55ydzcLGdd32?=
 =?us-ascii?Q?kgCaw3wh+aC3GuTcIwv6byZL0Z/vAg6VTNpeCkoOe88c9S+IbbVJdSf6HIQy?=
 =?us-ascii?Q?nYUmLm0cuxKa0LjCImvDax+24/j+8pD8emqAsbKWGl/BCbZWWfElTinUBvX0?=
 =?us-ascii?Q?iwkfD1916XUAyae0M6ceD8pIrxr5lUiS60WuGFNd7XGzv2j+tfylyyuwWqM7?=
 =?us-ascii?Q?GSO6vCPvV9McZpZkVwdoOQZEFLrdvXleIzrm6xb0wLak7r3Fvkuq0bfBjgRs?=
 =?us-ascii?Q?w99bYUcap/YPdh5ol2K77s41PgPYTdB6pGg1Z9+xxQm3CEYugPB4ToDElOIg?=
 =?us-ascii?Q?zidRSrMH5SCoE2ehXLjLDMVZvAFOupVkD2ONE63AIS3Nc8Kzeyt23bCtBZrg?=
 =?us-ascii?Q?aku2zZk8NbD3MM8EVE27uPMhcBQuZVKq9y410LzoiqoKy2XPuJtP5jcWS2mS?=
 =?us-ascii?Q?pgpcC8ehc9CNQNu18Tyg95aaMDedjmmP30CPRS3mRzCYOYHreM/1I3dgk11B?=
 =?us-ascii?Q?YOos8Vkht/LuyRqTCVzzvgl3ZMMNi+aS8koa0YKUGixqqu5YwR0Wl7vUaNOI?=
 =?us-ascii?Q?nA58wr8aswGxzo4b1CHVkWtVFIGiS7GDlUoyXlwIcD/cKMrVLHF8igzTJt3S?=
 =?us-ascii?Q?rzbZsjUR8Byl/VcS4XfbgaaJyKdyHgEc37hmRi15wU2zLU0qJNYmyewtSgZm?=
 =?us-ascii?Q?CcgWD1Rt17FEf7I3lvdeV6gFj62ez/lFUYmXwkTtWlf/DOw0ho+Er5DDAZkt?=
 =?us-ascii?Q?6UU0VYmjp00HXT1T7jA4Oa/55FtBsF33r87gXZSWfhqqGwKxkbz/ToB7MV2e?=
 =?us-ascii?Q?29Y6Rlzgxa8+9zgDx7mXSwMHDdOuxGz08PMHRgkE+mBQ0wgGNc2h+abNjzBW?=
 =?us-ascii?Q?+fc5uCZgt5uWaoeSea6m53wVXtaysEZ1/27p3nYY9QpLUNgNdETvB3FAyVRx?=
 =?us-ascii?Q?isEuLrxHCdtvwjTOaCopyQkoU+yyqqVevfE0SCZN?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ce2eac27-9a29-4983-16d3-08db76acdb2e
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:21:38.9752
 (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: iUUfBKNrLSt1D0d/emwNSGoVhDEt3A30RZM6flojiEu/vu8BaP/6CGcphBbGtCBUZD0mFxsMrLDlLnHcSTG6qg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4378
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..5f97fcf5c4ba 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(rx_len < sizeof(struct beacon_rx)));
 
 		local->beacon_rxed = 1;
 		/* Get the statistics so the card counters never overflow */
-- 
2.39.0