From patchwork Thu Jan 13 08:55:09 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: 12712460 X-Patchwork-Delegate: johannes@sipsolutions.net 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 70FB6C433F5 for ; Thu, 13 Jan 2022 08:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233251AbiAMI4k (ORCPT ); Thu, 13 Jan 2022 03:56:40 -0500 Received: from mail-co1nam11on2086.outbound.protection.outlook.com ([40.107.220.86]:28322 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233137AbiAMI4T (ORCPT ); Thu, 13 Jan 2022 03:56:19 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L8rHHY+r3CL2CiebgJMxGThPKAW6t7NaZkmirOahmavH9pa2DlzflPmOfMI46s+cguyo55udj3Z26fy8JAK7/snDKzkFSVvysar7KfY5Ra8aeD7X2SSG02OzMlSTLHt6WDdHTkJSGImHIY3jAjwfhqoOEaqs+hGZeO2wS7l8ejueNTofHaOZup4Gf+Of+XWdd6PNdQBvTwrVNSf5CX3+vNlFJ6g3S1nQAFyjSOWl7C3SOsTWcJGfnKKXdFC9J62RDCKLNOFw3rHJFixdILDo20t21E5vnE/G2YIEopDRlmQuCKmIU93NklTQff6vhVEomJWcANNIShGu/ufRRUSZCg== 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=HpAOB4jPiwFwFBf9z7IRPkeyewY+ZAvGsFdxxTP7PvQ=; b=YS64Gubhb+ric0Z0XwhCmrxzsHIa2IwdxKNdJr1dKxdgM6VNjpfA6zXO4h0rrKwt0qoEIy5bgWJeGgm8I5IYaJaMLnB9uceey1s4Fml6U7HAx356Z1jn/AXptOXd7t1WFyGI37bTNXBuPDocmWstYu5ngr9bNlYGoqKO/hdgr4iKNtQh78QRcM27ObMeEZ9x5IY4ax/2E+qntmh3nqQe5dEsi+SI3Fj0gVEiwO2FvDXp7cqMiDMtflrJ1QSLX9kF6N/9sqrWBXUmac1vzfDPRfc5QebTKaFPm/+oDmTkETdzWGLzgLFBENgy/0qnp72ZPJejL/hHWqJ8UXlb6kRnnw== 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=HpAOB4jPiwFwFBf9z7IRPkeyewY+ZAvGsFdxxTP7PvQ=; b=bpwVHPwqXHywQVxXMaAlTst3zDewyEb0z+BmwAvLNjmxqSZboEBULwtL8OjPkOVBgdmV+9CdJdVll0cwEeiFavAn0QMqJ0AXg77TmZ/GF5DRC9K5n4FmwU8VDP2CPjSe83or426aHDAbzMVPQihtdFo6Uen08tKgRV4p3o9fY34= 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 BY5PR11MB4040.namprd11.prod.outlook.com (2603:10b6:a03:186::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Thu, 13 Jan 2022 08:56:09 +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:09 +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 16/31] staging: wfx: prefix functions from debug.h with wfx_ Date: Thu, 13 Jan 2022 09:55:09 +0100 Message-Id: <20220113085524.1110708-17-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: 048bb83d-65d3-4ade-7914-08d9d6728ae4 X-MS-TrafficTypeDiagnostic: BY5PR11MB4040:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oc3iBh0XeOG64m2kHbbzDvpOjnbWTa2FwGPaFKgiUcFCzh1K+Iy0+Kn1AZmtvNY4aBibG4TVnO6jGuqjl/wKzoOvXtuToxrwNoRaQRMbdz01GV4Jet1YuK16RGpA0BQoAVnE8UCseq9y7ljok5G45gR6G1z9lRsq4JpmkftwfbfkAE3Vczr/UZH3vS301CVv2O6ufk04kWoigCK3ri3DKc6/LoD7dtHdAorPTETGLPkhaMeMeEa0a7B6QhTW07JnLAMlplOG2c/UJTkCK6xY24Mcl/5X5lTs0q8HsyGAUTWGUkaXbqiWa2Lg7jW2qEHTPHuPYRGPSw2rC7UhPOy/fIqyytjG9ePWHUrkzlYNACE8iHtF2Jcvu5WNW7tZidpLx3YCLqTIYENTlftOhsMIl+A15EFsBid8/sDOvAZWg+IJHciIhI9QTVhJlHbX8/AeS9w/QZlN8CHj7XMuMqIYpw1NbhWANhgtWZ5439wjrsRBat/2EOGxAjEbIXrreSyjx1SKzyg0i4t6HegzhUARfj1p6SVcuC1OJqLKfvJFnS15YLTGMTLqccCVdQZcPSq6FzEHDQaSFY1CPT/7Tt7SNim6Ne4toFth4nPz5Mzqbiq/MIy0eLnF39+v8W+yPriGeP5LG9at6CKze0li7GunTQ== 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)(6506007)(508600001)(186003)(38100700002)(4326008)(8936002)(6512007)(66946007)(83380400001)(1076003)(2616005)(54906003)(86362001)(66556008)(2906002)(66476007)(316002)(52116002)(36756003)(5660300002)(66574015)(8676002)(6486002)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CejwAAXG8+ndoJOAakbUXPlEpbNC?= =?utf-8?q?CGB0LiOhEr97h5SxYWKDa8COSMiPdNjNUisw155e4act1GkloCUj/5rQJmuFuHtcw?= =?utf-8?q?sUeEyWpBwMTMjdZcUzFzRTdR6JM+PF5tqOAbUecX1SkyK44hU3U5GxXjHI2uG38Xh?= =?utf-8?q?5E+MNio1Mi73P1kI3CM2e8Ab2GufCIakYo/C39TQ3VTjbQdr/jnl2+qV+Hm9NZOOD?= =?utf-8?q?I8xnHBWmCzCBs23hYqwPp9qgRi7Yglwsm+qekBm8cRv4lUyNscfUX3CsoT92J9te7?= =?utf-8?q?6tYKm6NILKfd6ff3Xz4aPowOZENABucxesPeYz5SKzvZ3QG0H3s0DrL7/dhwzRp7D?= =?utf-8?q?w9fYJFRgxjk6iBUrY09rxQCsIaIRNzhPBIoY3IJ27EIHK9mX6R4e2T+lSqQ2jD5pY?= =?utf-8?q?IIoy6zD6YAvoatBrYgiIZehE0w9HSYR+el/sAMHdKCbY/nb3RuE8ohVW6DtHp7QSt?= =?utf-8?q?e38IV41nXkkxF2N8d+zASmrs+uwe8Rj368yy+eljgj8y7LMTXsMecaIJI0DScaHyo?= =?utf-8?q?7XdTI0UkqXtXG6B3x+r6X0DlnU7RR716eFbxkTITQeKJSbhIgRt+XEJqjOFReixIv?= =?utf-8?q?//tMJKgRjVvpmknafOX5dChfDkvEKpEHHoqX4jFEgO2OyXfGuTkOrSJCp4U0PgrdU?= =?utf-8?q?UlbV0dC+LOgm4yZ152fPDF0A02GxTZsCxX14c42V1Y/oCj3GrYcR8WIpWC5mcImBj?= =?utf-8?q?SM2UDaizw/Iux8P8tpauEWxCsWavboqYYMPLOshE0euR61lnc3QFnNzdKnr0wgHDo?= =?utf-8?q?247wQWSWVn71rrPhYNgTqwWV7GBcz7xTyyEhx+n84VUQg8UwsvVXQtSZ4cKcgpIzP?= =?utf-8?q?lhUD5nnWZYOjXKTxN+kvzaJ61D5VgjGu22CE8Sr0GNA4zGCqsVq6m7CFvACfYobYl?= =?utf-8?q?wHbs5U9Xsp5CKPLYPWceyVwIY+og+M+gXEMKhgUmnPe5qAfbXBTMK328sKHcjALrU?= =?utf-8?q?QeTqduVMbUf+F/2qlgvO4zEv4I6FEByjwa1GHMRTCSuLfTeB32r545aJI4xHBwZWU?= =?utf-8?q?AjTJHU0EFykhmxAZBhddP137gDsdIZDCrjFf7P+gMp1T8UJydxv7F56Wd/cN+Ug91?= =?utf-8?q?0AxcYNo5tLQrSkvZEgvDnBbbgHrY73uM7J2m7kAVykl/D3au3lZJD3QtE9u0RRUJK?= =?utf-8?q?O0VM2/HUg00SMejb/FSN2oI46rQrnKpua5hKwWahBhoarhOuIEdyNUPZIk+EUKrXU?= =?utf-8?q?sEy/d/em93FlkD1Row1PkJkk7GRYG35j14XwLxzCb8t2lYiYfsQaevUa4K2LJ2lXo?= =?utf-8?q?I7pIkt08HxKoG8hBuU4tgMwYjFGiUmLNVMh4GwXYtn24/xjxdSKOE/17GKuWEjsBs?= =?utf-8?q?bSfkCQRJIqJNw9suC7Thnd8ojhZ8JgF6gFHjRpTgQviTS6Y2mZubMYZx+gh/Da92S?= =?utf-8?q?haQTxB4qb3kGagpWuIrpaoTHD6XR5kn0+7tIH2bIsskx/ZjlVPZ1hKI/Qun4+L0Tk?= =?utf-8?q?nPklI9kYvQVWDajuO3Qf+DMzlkTwVkeuI0QM4tP4VHSNRhJlXkezgW/UmKBj7jvyx?= =?utf-8?q?iKwLjp0psZ2N6yAZsSGb3uDPIHxZVLCcVfZAwX6dJ775OZjOczAa151J+o13Pss/J?= =?utf-8?q?GrZtnQ+7WOTmlEibCAOQtpD4FKJajRDOVqKpSy0X13B9AxwzcRVXNM=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 048bb83d-65d3-4ade-7914-08d9d6728ae4 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:09.6980 (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: Bkmw5iBWUHFgF1HUm1Mbp0e4YRYSIL4oof/0525Vdy1HQHdxv/P9uAmlE/EIneG/Wls3NGxXeaURVgpkbBakxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4040 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller All the functions related to a driver should use the same prefix. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/debug.c | 6 +++--- drivers/staging/wfx/debug.h | 6 +++--- drivers/staging/wfx/hif_tx.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index e5f940f19bbe..9324248b1d20 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -44,17 +44,17 @@ static const char *get_symbol(unsigned long val, return "unknown"; } -const char *get_hif_name(unsigned long id) +const char *wfx_get_hif_name(unsigned long id) { return get_symbol(id, hif_msg_print_map); } -const char *get_mib_name(unsigned long id) +const char *wfx_get_mib_name(unsigned long id) { return get_symbol(id, hif_mib_print_map); } -const char *get_reg_name(unsigned long id) +const char *wfx_get_reg_name(unsigned long id) { return get_symbol(id, wfx_reg_print_map); } diff --git a/drivers/staging/wfx/debug.h b/drivers/staging/wfx/debug.h index 4b9c49a9fffb..3840575e5e28 100644 --- a/drivers/staging/wfx/debug.h +++ b/drivers/staging/wfx/debug.h @@ -12,8 +12,8 @@ struct wfx_dev; int wfx_debug_init(struct wfx_dev *wdev); -const char *get_hif_name(unsigned long id); -const char *get_mib_name(unsigned long id); -const char *get_reg_name(unsigned long id); +const char *wfx_get_hif_name(unsigned long id); +const char *wfx_get_mib_name(unsigned long id); +const char *wfx_get_reg_name(unsigned long id); #endif diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 9899e7b62203..67f1847c1fc1 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -106,15 +106,15 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, if (ret && (cmd == HIF_REQ_ID_READ_MIB || cmd == HIF_REQ_ID_WRITE_MIB)) { - mib_name = get_mib_name(((u16 *)request)[2]); + mib_name = wfx_get_mib_name(((u16 *)request)[2]); mib_sep = "/"; } if (ret < 0) dev_err(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned error %d\n", - get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); + wfx_get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); if (ret > 0) dev_warn(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned status %d\n", - get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); + wfx_get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret); return ret; } @@ -196,7 +196,7 @@ int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, } if (ret == -ENOMEM) dev_err(wdev->dev, "buffer is too small to receive %s (%zu < %d)\n", - get_mib_name(mib_id), val_len, + wfx_get_mib_name(mib_id), val_len, le16_to_cpu(reply->length)); if (!ret) memcpy(val, &reply->mib_data, le16_to_cpu(reply->length));