From patchwork Thu Jan 13 08:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 532420 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 92412C43217 for ; Thu, 13 Jan 2022 08:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231301AbiAMI4N (ORCPT ); Thu, 13 Jan 2022 03:56:13 -0500 Received: from mail-dm6nam11on2047.outbound.protection.outlook.com ([40.107.223.47]:10080 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231950AbiAMI4E (ORCPT ); Thu, 13 Jan 2022 03:56:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AgU9kc+zmcs5G2YCHe5b8qepuiY83IFzTZCvH1AiXfpUxDykoabroFNpnu6ZOCibCHc643a2IdpPWQADj7mr3Wa96NsQlo2rRIkwk2cTGYc3DbB1qQcYh/GATEafIWYUXKT11jHd38qFvq4WhX/lAr9NMsco1YWAIgvfXaluZu+WujVYbwTMR/yuZyE2GmMNTujaVqKgM5vk3cl2UUSvXRn1QJ8CWMgivYbojvX0WpQxCzutp6l/H6cERVHXdl4Ob5yaqNYy5VCs4x7ko1ZQwP7potPz/VBqqQqwLIT9qLJ+VuMn3JacoDs+aDyOxahHp6EJt+qd7q6WCpwTxiK/bQ== 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=+xvJ0MZ95/evykgq3ZVCecbw8UJnlO4e+q6rZ3V4EpU=; b=fDCdS3fQXMpeP9LDzpXEPTq0POoM6APIy13/6yrLBXICvktjFLMyjvcT4IYQciPfFKv0viV5uKu9I7eBs57fp4QOuEbniVbKqGaUoXfEq3YZXtLdOyl7ZtTQwC8e4bFxbp/ODMEMv3KsV/v4zqmkqAx2GqPpHt8N/SkdFw1BAqFQaxizUQgf/SlTFWG/R4FF/Jo56Rl42dOFPi/ay+AoRLGm84h/Of2HS/wQinhlVT0j1gSQ7TRavHoPZ2lUC8OLg6Cbm0EFIumDGREvBeD/ScbkAzImxVrYrQQfapi9niVuBG8W9TrGDTj6y3dItjLAcae3Trpg3uB+HQ5VKq3dLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+xvJ0MZ95/evykgq3ZVCecbw8UJnlO4e+q6rZ3V4EpU=; b=ddVhdVoNqpuKjv/XeaUZPbeDG0cYhMONnNbrCL07vCuGaQGME/HVdWI3OT1i93Ak5/oE+mGMCz1zg2WUn2sBdoFWKDE5zSc+17cNjuy9qyvlztcHAHRnCXerAoGbGfnkx1yLzDmLNegeJX1kJ1LFEas7GPwVBsXv9BJ5BK+O03k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; Received: from PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) by CY4PR1101MB2071.namprd11.prod.outlook.com (2603:10b6:910:1a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 13 Jan 2022 08:56:01 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4%5]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 08:56:01 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 12/31] staging: wfx: fix ambiguous function name Date: Thu, 13 Jan 2022 09:55:05 +0100 Message-Id: <20220113085524.1110708-13-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> References: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SA0PR11CA0117.namprd11.prod.outlook.com (2603:10b6:806:d1::32) To PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb03a002-08ee-4f3b-5f0e-08d9d6728605 X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xmLi/05hjIAIFnDnkQWDlHspaDmWbs5bvm+nbCDfE9h4sBM/ULMb1jQPbMcIQ03aYsjT1ti043lRTT1aH54RBHmUqggpKVZWzXmmfdRhym52Y86ivjcS7kxwm/d34RmfObUlSffpO5MhxC5CD6z1N17rOvA0mDaGxRGVdOTCgZ3gyTEY8/w2LfLfCIjgyKMSEJqvxpYSNiOoqr6+2iRRQTZkEnEus5ZNehyQU80dVpu8Ps8gtMJfVEeBaWRP8JDa9wiCW91S1SFI8HAdgaN5VtQBZVL+nZF1j+5LsW0wn9UDD3t47Kuq04BL6lzWkmyOEoTfwEsXWgbc0xUT+wB8OjUGvbVVPrYoKMomSKjgMvagllhrdxePWUrh+O+axqSAWNbbIDUqF/tYQkf4BgqhtYw2QpO9sgpQft6sqRxXyPeXl7FJ6vmAOMv/cpZT05HUuhRhgRFw/9RHqFT4CRdbEqdh5VdHWwsKUj/DRzMJsQLozkKtGZLuETw0V7uSFvpKy6iYGFSZC7FVkkL60+rycA9dXX/KZ/7EByBCvLVJZD0vmcwX3Wbei0lulbzAHNPj8f1j9eQ37WhTRYPwiCQRMMtMDGin/yqknvRaxlMbuqrcACbqbVxCZq0LQcxBSGYz8FcVGLiokcYA2OB4Bko5cg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5657.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(2616005)(66476007)(52116002)(8676002)(6486002)(4326008)(66574015)(38100700002)(8936002)(83380400001)(6506007)(107886003)(66556008)(36756003)(508600001)(2906002)(5660300002)(6512007)(1076003)(86362001)(186003)(316002)(66946007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?PV3eGJatAFQXn87tK9oDi/0clZ4Y?= =?utf-8?q?QLrDGCbKKvrqadoXVkov5MYhs07DUg0oBYbnfu15A7H/FyyB2tca3VlU/mXZo0NiI?= =?utf-8?q?5uRRKXzwUySqBaIfUZyA68bygiAQYGAzJ83dHSdIeckzRwnuoM3RQxhNKG9i/LZVj?= =?utf-8?q?X/Jh+3fGH+JfyCB1GJJ+tkGIoJYxPGKPex/DNS59ECKZmRJjgmuu7iDzq/lc+VzLk?= =?utf-8?q?PiGh2/C4sbkzreG0btIW/C4zPnHDRxwClauv3+n2IM9DNMjYZkUMq8ijctQ7kaNww?= =?utf-8?q?nioFlYUlTO3QzI3H6y+RM5dCQ+1WJY9/Fe/ASou68W1OkWbDOYPNIcb3vo4Td0luS?= =?utf-8?q?dc9GyOk9QuWDj2HogIcUWWZz4ShJZrPSH1bTYfeRwMs1gN7z9/QXHuqTlBUl7Yhrq?= =?utf-8?q?/akQAVk2NW4d3vvlY/2VKqqlE8LgNpSgoovqGcLasHJ2h2PYzV6qfFxGZODzcQj8W?= =?utf-8?q?Idgwo5msZIUkoVWKr8/FwMpWGqijdturxTaUwTYJXOuX3CZRYMxr/Ff0xnwdHRmmV?= =?utf-8?q?I3bAFd2U8EzmyoIsxIn+a/d9sz1xI/v2iu1zlwOitswlLwcrB7p0QFmOt775fhBRx?= =?utf-8?q?ajBy6P5LjqW+gNU2Yv+X4vEpmYc8CS9/KLQHz2IK44XiJA71kfYxKFb89aMmLCkT5?= =?utf-8?q?n+6XE77whiXJM+zJWCi6ckw7eFL9n7UPcNX37GErk59yas5W3iXU5c/cBkoVtmXZl?= =?utf-8?q?PwdFAByRW+wHbbxFXeKbjhnJMz6tzLEcTxP+cEv6P+6IkSOfHRKgKCBXf40+w3PUO?= =?utf-8?q?WAJyXGy6JWPZgoa8vm5zVr4+x0Zu0sOm1ydfbY09Xd3zh2PIKrjJWN4GuCec5e9Hy?= =?utf-8?q?gdjGy8dtnR185VtbI5lZjlRjlYdIJ4UDrHssXGwuifs/z/+xdknBkUKK8W6bUkB1/?= =?utf-8?q?W+dV6saT/2NoPYzfnbsAcCBoNumKlRNwDUZJL96VRH3uIW4IlQrWL7z36BcvptEWP?= =?utf-8?q?gGZxPUsoXcAKi181hJTLomF6GUcMwjpEsLWuLi3qlLAOwq+2FroR1pPW2KFRumYpX?= =?utf-8?q?pje2Zh9aoFDfglFAwUMUsNuyz4yqb6VN+gB+E/4VOtcv2ojCS/ljzlZNNu7dfOnLo?= =?utf-8?q?KC/SKAabh0FvUemf0nSRSASLTB2Ni/DGDy0vYN+ODrdxSHaniftMYM6HlVu9Eiyvy?= =?utf-8?q?Z6efgPZxgyPp6FtC3U33g6ozFbJH6zs3DI/4KyM1G6t8e4jbF65TPayi1apeYei+N?= =?utf-8?q?AIWqrqP0//XEdrniUgffEBvz51v7+U+a02PPM8JCShfZMMPJ2G5j/idepSpEd32SF?= =?utf-8?q?8g9RivxwGneNUlsgiLJa2I3S0yS0C0zINQAU8RRyCJVH3r2E+LDc2XXNljaJ9KQ3p?= =?utf-8?q?kx51d8phBECYKZUh2Us6r72shsnDZzca96y53vKbK++p7pwl2dfsAibJWOKkqO90r?= =?utf-8?q?p90WjUVXKqqNmHwkRNxJlDmWHlMNcvC3gZE9Y/SNuyC8oIjBB1EIE5bDk+sbx3XKS?= =?utf-8?q?udBbYdFFxXwU1jVZoP1wJ16OJ13vAo8IlpZIlf9b8OjMyIILqAllLeqYqb7YX31rh?= =?utf-8?q?J/XOqBTx/L96pf58A5o97mlrqga8ScH7X2vxAfwC6xitbE96q+NZ1J/Rf+V1f8nYp?= =?utf-8?q?LYh9cT/wEQsgcunR1K874B1P7ebG0sxafJ2+aav3yynfonka4Luqdk=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb03a002-08ee-4f3b-5f0e-08d9d6728605 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 08:56:01.4794 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: p0OIZJx240U1DLZzdUJWWrBqyTOTgDRzLFy8Fp8ZYrc/ZVg6TK1TwuSg7QeAlFRo2qhMKz2hsu/Vsm5tG/scDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller The prefix 'ieee80211' is reserved for mac80211. It should not been used. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 668ef2c60837..a1fd0f850481 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -12,8 +12,8 @@ #include "sta.h" #include "hif_tx_mib.h" -static void __ieee80211_scan_completed_compat(struct ieee80211_hw *hw, - bool aborted) +static void wfx_ieee80211_scan_completed_compat(struct ieee80211_hw *hw, + bool aborted) { struct cfg80211_scan_info info = { .aborted = aborted, @@ -120,7 +120,7 @@ void wfx_hw_scan_work(struct work_struct *work) } while (ret >= 0 && chan_cur < hw_req->req.n_channels); mutex_unlock(&wvif->scan_lock); mutex_unlock(&wvif->wdev->conf_mutex); - __ieee80211_scan_completed_compat(wvif->wdev->hw, ret < 0); + wfx_ieee80211_scan_completed_compat(wvif->wdev->hw, ret < 0); } int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,