From patchwork Thu Jan 13 08:55:18 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: 12712467 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 8F9D2C433EF for ; Thu, 13 Jan 2022 08:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233430AbiAMI6R (ORCPT ); Thu, 13 Jan 2022 03:58:17 -0500 Received: from mail-dm6nam11on2073.outbound.protection.outlook.com ([40.107.223.73]:16221 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232463AbiAMI5e (ORCPT ); Thu, 13 Jan 2022 03:57:34 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gGZw1gsa+ckb6Iogp0J1MLALm5LbBLWT7FFiDGUkFTp529u7JgSr/9AJq8Kjyiwn84itvyIEJ2ff1Mo4ciGJ8pEPJIZGbZh3sxacQrL2UARkR6RMJkIMKgzwHIh7EtXIgaELdpe2YWQ415aIquZJHCdE+Uli39bMB7Qr6oDBCxx0Ktmyet1oOfG6EhlRzykwaUtwlkV4bt9BKEA6F82QD3rU+XOdrRxTV9eMFHhx6xHcZVPeW0jdgCRzFiXcxmiZmXvHviiR7JPl1MeFjWu5vkB25eNpanM0VXj392QmaqGfLY9pZDDCgYGJUSOPSw61oqmo+9g5WCOCXQV55cksww== 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=qIcn4Cf4/8ZtWki0hhroUT1yK9q1a3c0Ptu+hemQpCE=; b=TKXaqnOEc4/NuthzbmvoBet5q24N8GinVi4QLZc68ff0R5fqazxgUZn3V1kPBpJG3duRMXT7qFtaJqNRXP72lq3jmVa1xlDdxECjHkOaCZEmZ5W0JbKBRrYgymJ2G33F92/7/RQO8bwY/vZILtZKkQkjvh0KeGxhuQ4I5CKdvUKer+uE76mGOK5xsxjRMR2eNUaDC9vFsK3VxCDICO5JSx8xOOQthfiWh62CT3TMlnXxuUAQVaZN7B0Ga5ycCVqAhO5rmC2NY/J9/Inj6LD7qGcOR31GpY+96T/zjShwj06m9ZfsLt+Kc2v4sCOecrbeVsGXZUxGwTIuH+QuUU17aw== 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=qIcn4Cf4/8ZtWki0hhroUT1yK9q1a3c0Ptu+hemQpCE=; b=P72QgOd3Hbn56/PQPXoXBlvyiEKM4gy0Uj/X1reUpWAzTYQDV6qH4WyKKJUAXDzkrv9EuoGD+YzX9zbu5zwMTdu3rKYRZLrXpN+vk/BBjpPXcsOMTmejFB/CrnGwm5hbHs/p8cbz6N9SXbK4wNu4SoD+CD3i/1VPxMhlSmifT1I= 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:28 +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:28 +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 25/31] staging: wfx: do not display functions names in logs Date: Thu, 13 Jan 2022 09:55:18 +0100 Message-Id: <20220113085524.1110708-26-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: e941f6d5-75b1-4660-db02-08d9d6729638 X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NMq1SZxEvAAXJpatY9K9Yhb+jNbx+o6W+ACpgeO6whZUSXuNKClTRY6Llr5AHLV60q3UVnzrkhC9NlscwEykfPtHJTYjN7qDV4L2dF21wYZbTgLZNbpBI2CHiLiBq+ZQ6zDBkzTXoF7wfZOVTk3E9PZ1oBMgSAKu06MNKHvSTNrbfjxi0CNX4UOiABj5EQbchn9axJS/7MIlmZz7X9lnrAOHoE4qL9lLkGGcwdpSp+pNYCLlf//WB1PHLzUckVN3w4nnoYJPYCKuZjYjnRz+1NgFL1AkOX5gvm2Q7k7tBppJvUXIZO8J4TuzyYAdPdsjPajop2Ar4jwAUC4FgeqNnygbsXOHl7TW1RsRZZElAgkIlWV7gOiF7ELA9DLfbZvtwNA03uLKLruzIAp5jJ2RhR0KSKArJIM0ainhSxWp0PIzjdHhX2vI/9Z6h3SyAlF/CyWY/a/HH7poTTrtcu6emoCi6ciWRIscrCEMnb9ivUaifjAy4N/TveEk1361RP2ZNskweIqf73UbpR/iff7sBaCg66VpVEMBx6Jdg+Dd9g3ICtXh7Jg18s2PCO8kVt4sGa2KpFrFB6DpIRM7A7zq8Kl6NYvUdJHYP0RpQpMHJZOjAPBDHBV2FlCJhYg0cgdMiy1sUWcH0QN0kMLrRAP9Jw== 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)(6666004)(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?MJVB4bwuGihY9D5SQOq+MsBarmB4?= =?utf-8?q?eTiz6VQSszhJj92U/P8ujrDmDBl7yhS9w+/0QddgchTu8zgy6zmUGVIUjuXGbjpU1?= =?utf-8?q?tfW8xr5TBqQ9YtkwO5QijwabTJvOeJ7QxzrvvBnYBWS4fGa2XjOmfSHEqrmBXwxrY?= =?utf-8?q?UdrF+B4Q9p4M0SoXUeShiKN2Ewtnc0ciaH4K23Ez9dI4//DnyMjktShtd4kLTPCv2?= =?utf-8?q?XC5DAWz+S1gWMl4EdLQsIrorjfqKbUc6stqzNj8q/+3e3lIi2ptHT65dmeA8uj2JV?= =?utf-8?q?Yeoi1eteuGsVEjH57HPb5w9uV4tkxTqH7vXEIMsKbYpEL7OcZC7XWihXQh7j8R/Br?= =?utf-8?q?syWOo3la0GoG3WZ2/x2YQKKObj0QbLEejc28V97lldhNCPOPLkwFGgVq+OEUA/m3B?= =?utf-8?q?zs9ooFP6wjIAQ0yuUfSywGZIJbuPgXeb01fosfY++gef/1B+/Qt6PVGe5Bk7+vXf2?= =?utf-8?q?MULpfQyUfPg+03feiSgYcjzEnsmuzkuKiUhFvwwIhd/3iar4W/AOBhtwMe5YyyWlq?= =?utf-8?q?GAktlUB5e8nsBEJyvAiZ6M2xtUciyI5QNbAvZF5u9qltZrKmSA85YmMzYN8whTkor?= =?utf-8?q?rn7/C9S9/Lgdw+81bltjC4nZiKLIRYTa4MllZJ7BgFN6d9mCfkv/RXnG2iBj6CeS0?= =?utf-8?q?jiKsXjTAlhzfdRiTGDdupWk57zLqWhHh8oM+X7eHNi6DXC4NwikPI78c7L9L48zoW?= =?utf-8?q?zPXf3z9ckZwohEWSIn38u9h/Ptht+hxqaeYdRPAnMqyLy/NzGLUtCXBDlfKV5Ig5r?= =?utf-8?q?ZYTG8JNWhkD+SadsVDpQgJSo1vYBAp+EYpo1NOih3R11nAFz22fLPp6zSqM4L9CUV?= =?utf-8?q?0TdGmLJ9ZodhWykiiW442UqYosDidrsLX36iO7bJeP0+HbSpExlxVY9ehNFawonqz?= =?utf-8?q?VweokcXnWRsLsdgfSgeiGv6W7eTzaUxgpWSWr/hVPGtvJwfIz+CvXGZAiozEyXEK6?= =?utf-8?q?On5bkukioyxT9Qj8cHLU7ozfqNoulrqjb7pPQdsWhD6z8juFxkpQo+6UfGKaoddmg?= =?utf-8?q?SI31+u+UdDkdaHmzYhTpreaz5hQtI2ML1M8x6YjVdLt4xbUW6lN9PrFSfqa7s0O68?= =?utf-8?q?ikkLSH9e3c3YPIhvLg5atvIy+Gcud2MEvIwNEjD/E9535lNklyIyYOiyWAM9HFAOE?= =?utf-8?q?K1sysKaJIdljZbpyOhp+65gj7H5yayVEShcrnlSz6iFMOrCd9C/mXwGUiJM4vYmdU?= =?utf-8?q?CcYNhNun060v0Y81OuI6MzJ3LFLYmIgDiZ5BESnphT9mF6tQHqfkxp5MOhWQdNvOr?= =?utf-8?q?MHhcK0H98KmcxNo8wAUvjoEyK0a7EKoPyvAdcpl+Hy8roFGjxzfdJGsoqqw3KmtoL?= =?utf-8?q?mUXDVq1fcmXG6w7A8XHdQrvTAFMyOAAPxcdgu6TMbqJGus4rwrSGWccMZt2UnJNAM?= =?utf-8?q?VAKL91/cJWO0qC8uhdlTuheyq8PLdD33UVCP+T9/kiC4EUfdGHYV4p3xxltRJduH0?= =?utf-8?q?Ft08m2mXeA3z/kJGsCUMFX35YWvIEaQD8W1620gQfOTLxtY4DEDFrLNSmMBhvFl7v?= =?utf-8?q?L1iAeAcNSV7hGqYq4ZX8jogKPwwMkoPIpsaEwm4Qw5cWJHmQfEdKKB0FXh6BAWTmg?= =?utf-8?q?+iV1kz51xgMkv1y5jmhyCTbbkvkchubkBjbSSG1SZMccuHkJQIATlU=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: e941f6d5-75b1-4660-db02-08d9d6729638 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:28.6590 (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: MDKfUVBw11HY/IjV0BahVqHB2gBD9iyeRzrJt5oYx5RZqBHyKtAD6863B3/tN2sP27Laf3AGRjifcljuYhLXHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller It is not necessary to prefix error logs with the function name when an error message is unique in the code. Note this patch still prefixes the message 'received event for non-existent vif' with the function name since it is used several times. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 3 +-- drivers/staging/wfx/data_tx.c | 2 +- drivers/staging/wfx/hif_rx.c | 3 +-- drivers/staging/wfx/scan.c | 3 +-- drivers/staging/wfx/sta.c | 5 ++--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index 1ec4a4951d99..4c6ba9c342a6 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -69,8 +69,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) int release_count; int piggyback = 0; - WARN(read_len > round_down(0xFFF, 2) * sizeof(u16), - "%s: request exceed the chip capability", __func__); + WARN(read_len > round_down(0xFFF, 2) * sizeof(u16), "request exceed the chip capability"); /* Add 2 to take into account piggyback size */ alloc_len = wdev->hwbus_ops->align_size(wdev->hwbus_priv, read_len + 2); diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index bfc3d4412ac6..d7bcf3bae08a 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -425,7 +425,7 @@ static void wfx_skb_dtor(struct wfx_vif *wvif, struct sk_buff *skb) req->fc_offset; if (!wvif) { - pr_warn("%s: vif associated with the skb does not exist anymore\n", __func__); + pr_warn("vif associated with the skb does not exist anymore\n"); return; } wfx_tx_policy_put(wvif, req->retry_policy_index); diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 5300ef57413f..302bdb2bf036 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -101,8 +101,7 @@ static int wfx_hif_receive_indication(struct wfx_dev *wdev, const struct wfx_hif const struct wfx_hif_ind_rx *body = buf; if (!wvif) { - dev_warn(wdev->dev, "%s: ignore rx data for non-existent vif %d\n", - __func__, hif->interface); + dev_warn(wdev->dev, "%s: received event for non-existent vif\n", __func__); return -EIO; } skb_pull(skb, sizeof(struct wfx_hif_msg) + sizeof(struct wfx_hif_ind_rx)); diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index ce0ae4c91190..7f34f0d322f9 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -94,8 +94,7 @@ void wfx_hw_scan_work(struct work_struct *work) mutex_lock(&wvif->wdev->conf_mutex); mutex_lock(&wvif->scan_lock); if (wvif->join_in_progress) { - dev_info(wvif->wdev->dev, "%s: abort in-progress REQ_JOIN", - __func__); + dev_info(wvif->wdev->dev, "abort in-progress REQ_JOIN"); wfx_reset(wvif); } update_probe_tmpl(wvif, &hw_req->req); diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index f64adba350eb..83f1ac87e0f2 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -513,13 +513,12 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, else if (!info->assoc && vif->type == NL80211_IFTYPE_STATION) wfx_reset(wvif); else - dev_warn(wdev->dev, "%s: misunderstood change: ASSOC\n", - __func__); + dev_warn(wdev->dev, "misunderstood change: ASSOC\n"); } if (changed & BSS_CHANGED_BEACON_INFO) { if (vif->type != NL80211_IFTYPE_STATION) - dev_warn(wdev->dev, "%s: misunderstood change: BEACON_INFO\n", __func__); + dev_warn(wdev->dev, "misunderstood change: BEACON_INFO\n"); wfx_hif_set_beacon_wakeup_period(wvif, info->dtim_period, info->dtim_period); /* We temporary forwarded beacon for join process. It is now no more necessary. */ wfx_filter_beacon(wvif, true);