From patchwork Tue May 17 02:41:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Zhengkui X-Patchwork-Id: 12851818 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E6E9C433F5 for ; Tue, 17 May 2022 02:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236771AbiEQClu (ORCPT ); Mon, 16 May 2022 22:41:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbiEQClt (ORCPT ); Mon, 16 May 2022 22:41:49 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2098.outbound.protection.outlook.com [40.107.117.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71702271E; Mon, 16 May 2022 19:41:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cqEGwCMMxBYwBVVtoJQHeydxcehYxK891AzNbNgp1wuohFycOtnCW5HrTNeyL4z8e/p13DGcle+db6BOZsZI5E8Ttt4m5hr3mWr7TMFVJOjZzgkRK6A9AJHC8NClFmWDrGg9JLnrqpyBNXAknXuvyQ+gXjNPnQ9GVefWlKBtnAoCqaE/UQGPfV5F8FA9jjUAZJro1DoJmzAeIMXM9cGuOkIZS0+UOwzLugJJ6XWHd62d2wltKaJ05EAd/X246wLJTEHZ6sFIi7KCZMBDBHL/hnNL3p7TS/z7B0gRV1vtFlgkzE95yPeNzZNfEgECwjovDoNVqMTrMzU51+4vYareIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1z5+fqQW73EH1Uz88Qrbw4Xb1UTgCrRNgp1Jh9tnV54=; b=eG03ROnJbXfZfMTxmwB7YcRgiRY8r9Lfr+P5RYh4C+3fZmWinAzlKpK8bLKLy2mThhUg158hXj8KZFKVPrP8S75KvWJzIcQpEqL4Nqew3Ax+cBGIx6tUzAfaQojY8Ee337Hiw1yyxiZWqIviAxFlvbR/U8cuCDZ1lyBA+DQut5BVzw89A2F+aI1i979qZgMRQBHzokUmK65x4348UIIsTTyQ0VyURAFStwDAJ3tReujClz2KhbQ8GUBBM385PeIXvGS/73L6HFUS6lBkivI0uZXRaSeJiAIqb36F5eBFqDX59pYRamQPEAGw5CKkswe+dwtS/xQFXqeDDEL0i7ZqhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo0.onmicrosoft.com; s=selector2-vivo0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1z5+fqQW73EH1Uz88Qrbw4Xb1UTgCrRNgp1Jh9tnV54=; b=EOGRhxm/BetReTlKJVjnZga0M5UkrOcgz3KNX9CsHKjP0I+pcyhxvOT7Ntn76zXFnHeqzePbCJ9IeVvsvtv2f/0qupqHy+8lJnAjrvJgXDC6FGnerxqECJMcJFjWd6VysdotTXdEf6bOaTBYNaQXfpwwCoxVFDpGq6vJBOnz5Sk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from HK2PR06MB3492.apcprd06.prod.outlook.com (2603:1096:202:2f::10) by PS2PR06MB3622.apcprd06.prod.outlook.com (2603:1096:300:6e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Tue, 17 May 2022 02:41:44 +0000 Received: from HK2PR06MB3492.apcprd06.prod.outlook.com ([fe80::88e1:dc04:6851:ad08]) by HK2PR06MB3492.apcprd06.prod.outlook.com ([fe80::88e1:dc04:6851:ad08%7]) with mapi id 15.20.5250.018; Tue, 17 May 2022 02:41:44 +0000 From: Guo Zhengkui To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org (open list:QUALCOMM ATHEROS ATH9K WIRELESS DRIVER), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Cc: zhengkui_guo@outlook.com, Guo Zhengkui Subject: [PATCH linux-next v2] net: ath9k: replace ternary operator with max() Date: Tue, 17 May 2022 10:41:06 +0800 Message-Id: <20220517024106.77050-1-guozhengkui@vivo.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <874k1pxvca.fsf@kernel.org> References: <874k1pxvca.fsf@kernel.org> X-ClientProxiedBy: TY2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:404:42::21) To HK2PR06MB3492.apcprd06.prod.outlook.com (2603:1096:202:2f::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd1fb0dc-4994-43cf-380f-08da37aec7eb X-MS-TrafficTypeDiagnostic: PS2PR06MB3622:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fKfImLTYDs1U1W8XEZfMuCGE1R1tXMI0VvavXLGS+6qEoTcMSwNaRazW88YwevbULA8DRbpyU1Sk2P/fl0m+fGCk+aXj+zWBThbK6Yv2GjCkTZBHSdcGJTRBEOcgGYEeLGq6HTsFvxEkJiTOKG264DRs0YpcLMELVlHG7Y3tgo+Npo2K517SOkJH7UTu9TgmF+t7lo8mxEzV1fCiDE5/+QQOxkKajWon1vCCKEbwfESsJ4T7MYc56QWuyXmTJ5nOutT8uCZ7x/3GXh4Kt5IGRZfCETpMtQrheUgiFHXxiCx4zRh+nJgDvTzq3rLcsMa+KJBHFmivTwXkhv7/+jCiZrL1WEuLao/UIGduRke3nxh/TUDmZQWyxJqDIKSfDGfVuNH2X4gEdrQmun6od7S65aZKVFDBe2vZ5BuOMDCE4klxwpIRw1B5JR95k6G75E+Muvi5YbmLICSBLV6XmyQgo7WNmmH5kvSjzVWtKy1fsd4FXJdFHPXmlLAdMIyeXruDthQzd4imHPvWK3XPXDE1G2cKZn+l2mVWGM789ARQ1XaZVK91mCUeo/jPl8TZJOR11FT+4mWdgxvKjZXptGg84aPD5F0bfCUbwLCB4oK3PqscuqprqEBkv4zeEGAk6kuJyqch5nZz3z+V2CYe2PWXUtMo22OcBQNsVuzirQ2/zQb27+wq20uhzvqqYFoto2JAo+WYi6rL2AIgx6EGKcHclg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HK2PR06MB3492.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(86362001)(26005)(8676002)(2616005)(4326008)(2906002)(52116002)(6486002)(6506007)(83380400001)(8936002)(508600001)(6666004)(6512007)(38350700002)(38100700002)(5660300002)(36756003)(186003)(316002)(7416002)(66946007)(66476007)(4744005)(107886003)(66556008)(110136005)(1076003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 62NkKavqPaRCDcj5YpiHPESyKZ+A3RyK4NhQx7RTE0quOhOJPgPEyE0IqlYhDXhEohxHSjfVVC7+HQW7Z83O7jCBqWoTO6t8svkEbTVPLkIrEPNEbTmdw8y5P4WeEleY3hsQ+MhDEnc8hGRWARR6j/c4QBUk3tQEpgVYdPaEZGrKCEIxTt6OwNZ6sTrAzy3w0KNVC5roKNfGlLgTWKwRzPwFMCxo16xXp3F8OMXmndUAnHrLLzsSpbljJt+nS754bCyV3K/tx2m7yKSsMI8/2DOkTyssmc4pzcgAB6h+DkddiAYIaCYu/lpzjb6dgKnEy2ZKeOAf7GjFRdAWy4CMFJk1cirEROWJ5IkAMnvj57IyxZ5WUTCYj4ScJID8nDmorbiITe8F4p/kT1q2p7f9ifrDKGnzk9+0NnywfbYqUeGvW6Dyqclx2iI0QDYOCKt4y16Usqi4JykeMVIJ8tYFP6yuARltpsRi5h/XUT4OaF3mGCU4rP6HHH9nnf5GUSEThSB68nnYkfj/bBzJRh16xWwlpAfSlaUUkekNWbCS1+XdAVhp779S1HjQ5W6xeM/aUTJots4Zaqep+YxPnSyv0W3nJNh43DpHAp7gpMTppg2FNFIyuIq/RAjQdUoOayUO2t+vtEn5+YVKfIkjrF9iNqgsoInwsC+XGeP/76ZizfL5s++PIPgHnPtKH/+47i3Y8PWLnuM9ZEHun9Fnlwm5A5y0RYG8ip+8R3QcESXmbMbSHtu4FcSXcpDApE/b4KDqSij/HZ1unkigC8CZO4nnEThHk7Zx7hG+ZvDp4IL1pkCuA8HE45IhbhxUgunOPdta1UlfVwSTTI20xCY4Y+T+6yRXOCxN92eN9Ag4SfEGtmwP1+YkxsLtbuIxj05n1PxOyWAClGJJMi+hXVb0OfI9UKG85m4LJ/8sEvpmaHo1AOa1TrzBV7eD33kolhbNng05Fmo10v6bQ1pv3hOIztmNwpceePWnbjC20pjAt4uX4rzF5FOo/lxY18A9ehiHkOZKTC8EmxlXZ5nrPArJHWNgmY6bTYG1W2kmxaq4gOmIw5nwuE42J4ZDGXEChnXqvWQFSdzYsXQIHzBaXvSMw5fD0qIOdEV+GH/+597QxSyaW0zXmRvgfgkOkNnlZCVjBeUf4SUw0EKumW3P6fd8/2fnSoBk8g7QLEC9Ig9wzZ3/9W9cZfV+6T+8jA5H3dWhcyjewOx9yXUveHJGIXCS0+x14cHyRiDeT4kWdsJJ1wGsJS/Lec184Xf84Ve92OT7o2whjb/9Uj8LpwuPkM77baX0N3LchRIbHtCPSqn+HdxVsfrHh5gahztuUloEoTercDPbuoNlvObUOk3bZUR5kfd/otpA8v2pm4Q7GYY0fG8vPfzeGMHbo5/N46Kfk6QvxRFZFN7yvw8AX0KQNokXcJSEUPK8lzTpV/T/GPqfJcT51qi8LEfmt7LmOopTDmlyDvHRrgTsXG3EkNQmfSkozYuRSL/JQbQobizhCSPhfxgUMN52nCq2xWXgE1oy7r4XFUIEcb1nPGcpdgYynYcCLoOVzGfT7QFsTbnazi3342UjnCt9ibFrLaPYImu0TFWOR9qiWnrZP2l6zz/lndu7EHjIUKM49ubup2T5O4nOyGSnpux7A8IaRLtO+7mB62R2I7c3ncxm797xDNcK+fgfjs6bPScP4Q6kyeabnSLWA0U4nBbl7IOjogia6dx49QFai4q9+2b6o7htDHU749+N4xFrFQ== X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd1fb0dc-4994-43cf-380f-08da37aec7eb X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 02:41:44.5827 (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: Pp6KXCnwqGxLL6VK3RbwCgn21jUfnLZuQrIYnBr1XvfvLIXIYta8LyvBS6zL+aMdPFx3QOKYtHGLRNmX9rGSBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS2PR06MB3622 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Fix the following coccicheck warning: drivers/net/wireless/ath/ath9k/dfs.c:249:28-30: WARNING opportunity for max() Signed-off-by: Guo Zhengkui Acked-by: Toke Høiland-Jørgensen --- drivers/net/wireless/ath/ath9k/dfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c index acb9602aa464..11349218bc21 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.c +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -246,7 +246,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc, DFS_STAT_INC(sc, dc_phy_errors); /* when both are present use stronger one */ - rssi = (ard->rssi < ard->ext_rssi) ? ard->ext_rssi : ard->rssi; + rssi = max(ard->rssi, ard->ext_rssi); break; default: /*