From patchwork Tue Sep 7 12:18:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507821 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA62C433FE for ; Tue, 7 Sep 2021 12:18:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6D7A610F8 for ; Tue, 7 Sep 2021 12:18:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344144AbhIGMTd (ORCPT ); Tue, 7 Sep 2021 08:19:33 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:36856 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343980AbhIGMTa (ORCPT ); Tue, 7 Sep 2021 08:19:30 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A8E1F4018B for ; Tue, 7 Sep 2021 12:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017103; bh=cs5MWRb4M9tfwP6GV7LH4BPGBlEq/OdD8zQOU93qEGI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FBCaRINCW87AO4xZJh1h06uFa6OAJ/Fj2rwXig+jv1+wIsumW6XRlb9Wro9CJUnTM vrPHWspQWnPfncVtUtm6hFwtcK0mmg3OMOoa6l5gA5TtDgPnVzrqTh1HYGbz8U1oCW m5PslPKSJs/aTdYZDqoIZ1uNSKOwLSnXciWfAIK1fdkp37m2pjEgny+Twp5Ktmydrm cmW5OzZiNM7o7LBCtB2JP4ej8jwKAsTzpYOAYHHejdBxzenvT8ejAcc9qT1l/a25ud 2rqi3gjsxoKrD1EogKsqTM5GykUEASAFcQcx6XiuonlH+/mIpwdtwBK3lRo2CnSz/0 ieAkvlH6nbJvA== Received: by mail-wr1-f69.google.com with SMTP id b8-20020a5d5508000000b001574e8e9237so2044796wrv.16 for ; Tue, 07 Sep 2021 05:18:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cs5MWRb4M9tfwP6GV7LH4BPGBlEq/OdD8zQOU93qEGI=; b=I8vll7bCpnp1HhJL5it57GG8o5RjkKbT7c6/TVMow3auiMmOddGYzRPYY+S52aMZN1 JEiOesZdj7hEQYGQJZtzcJoAFlz4pT+8aAzK0X2v6eTZR4e06mLf1lWvSNNryAybP/Wk JtaTRglVseSxWDZtYue+CGFsPEEjjE09NWPK7wsN4nKFZmjmkCzg+QFi2nbcnH9CXrwL U6OIMwpsPf6NB8w+Hae94sdL3cVofPfWYgbPw/Imn0AqAK0YjBSTobCNPwQ/HMn9o3J5 f+sUrNQMqkk/4EiiN/GtYnkmzynalt24xnIZliAkG6qXSotTqoaxIEM0BZ674ihtrFIw QGAg== X-Gm-Message-State: AOAM530XDInhUHp/4lJ4CqqQ99UuqWkjqqaSSJhwuiI+wcJCg0f03HoD YYxoNSXWdzUa04+M5ctLpyhyIgAnjAHXDls3anpah33G9eC4bGA3rMNk+tgkahs1MosT6uKdtE3 KElgWydfU0CnOHmI2uButiwkX8PwNmkuRcg== X-Received: by 2002:a1c:c913:: with SMTP id f19mr3643108wmb.86.1631017103199; Tue, 07 Sep 2021 05:18:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+kz76NL1A6/Z2dbaUB1OxeAEV2PteNnWpvJVpFNIEgd0LIs640hLAU8hNli1xdtD9uhvNGg== X-Received: by 2002:a1c:c913:: with SMTP id f19mr3643092wmb.86.1631017103025; Tue, 07 Sep 2021 05:18:23 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:22 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 01/15] nfc: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:02 +0200 Message-Id: <20210907121816.37750-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- net/nfc/hci/command.c | 16 ---------------- net/nfc/hci/llc_shdlc.c | 12 ------------ net/nfc/llcp_commands.c | 8 -------- net/nfc/llcp_core.c | 5 +---- net/nfc/nci/core.c | 4 ---- net/nfc/nci/hci.c | 4 ---- net/nfc/nci/ntf.c | 9 --------- 7 files changed, 1 insertion(+), 57 deletions(-) diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c index 3a89bd9b89fc..af6bacb3ba98 100644 --- a/net/nfc/hci/command.c +++ b/net/nfc/hci/command.c @@ -114,8 +114,6 @@ int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd, { u8 pipe; - pr_debug("\n"); - pipe = hdev->gate2pipe[gate]; if (pipe == NFC_HCI_INVALID_PIPE) return -EADDRNOTAVAIL; @@ -130,8 +128,6 @@ int nfc_hci_send_cmd_async(struct nfc_hci_dev *hdev, u8 gate, u8 cmd, { u8 pipe; - pr_debug("\n"); - pipe = hdev->gate2pipe[gate]; if (pipe == NFC_HCI_INVALID_PIPE) return -EADDRNOTAVAIL; @@ -205,8 +201,6 @@ static int nfc_hci_open_pipe(struct nfc_hci_dev *hdev, u8 pipe) static int nfc_hci_close_pipe(struct nfc_hci_dev *hdev, u8 pipe) { - pr_debug("\n"); - return nfc_hci_execute_cmd(hdev, pipe, NFC_HCI_ANY_CLOSE_PIPE, NULL, 0, NULL); } @@ -242,8 +236,6 @@ static u8 nfc_hci_create_pipe(struct nfc_hci_dev *hdev, u8 dest_host, static int nfc_hci_delete_pipe(struct nfc_hci_dev *hdev, u8 pipe) { - pr_debug("\n"); - return nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE, NFC_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL); } @@ -256,8 +248,6 @@ static int nfc_hci_clear_all_pipes(struct nfc_hci_dev *hdev) /* TODO: Find out what the identity reference data is * and fill param with it. HCI spec 6.1.3.5 */ - pr_debug("\n"); - if (test_bit(NFC_HCI_QUIRK_SHORT_CLEAR, &hdev->quirks)) param_len = 0; @@ -271,8 +261,6 @@ int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate) int r; u8 pipe = hdev->gate2pipe[gate]; - pr_debug("\n"); - if (pipe == NFC_HCI_INVALID_PIPE) return -EADDRNOTAVAIL; @@ -296,8 +284,6 @@ int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev) { int r; - pr_debug("\n"); - r = nfc_hci_clear_all_pipes(hdev); if (r < 0) return r; @@ -314,8 +300,6 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, bool pipe_created = false; int r; - pr_debug("\n"); - if (pipe == NFC_HCI_DO_NOT_CREATE_PIPE) return 0; diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index aef750d7787c..78b2ceb8ae6e 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -365,8 +365,6 @@ static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc) { struct sk_buff *skb; - pr_debug("\n"); - skb = llc_shdlc_alloc_skb(shdlc, 2); if (skb == NULL) return -ENOMEM; @@ -381,8 +379,6 @@ static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc) { struct sk_buff *skb; - pr_debug("\n"); - skb = llc_shdlc_alloc_skb(shdlc, 0); if (skb == NULL) return -ENOMEM; @@ -573,8 +569,6 @@ static void llc_shdlc_connect_timeout(struct timer_list *t) { struct llc_shdlc *shdlc = from_timer(shdlc, t, connect_timer); - pr_debug("\n"); - schedule_work(&shdlc->sm_work); } @@ -601,8 +595,6 @@ static void llc_shdlc_sm_work(struct work_struct *work) struct llc_shdlc *shdlc = container_of(work, struct llc_shdlc, sm_work); int r; - pr_debug("\n"); - mutex_lock(&shdlc->state_mutex); switch (shdlc->state) { @@ -686,8 +678,6 @@ static int llc_shdlc_connect(struct llc_shdlc *shdlc) { DECLARE_WAIT_QUEUE_HEAD_ONSTACK(connect_wq); - pr_debug("\n"); - mutex_lock(&shdlc->state_mutex); shdlc->state = SHDLC_CONNECTING; @@ -706,8 +696,6 @@ static int llc_shdlc_connect(struct llc_shdlc *shdlc) static void llc_shdlc_disconnect(struct llc_shdlc *shdlc) { - pr_debug("\n"); - mutex_lock(&shdlc->state_mutex); shdlc->state = SHDLC_DISCONNECTED; diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c index 3c4172a5aeb5..41e3a20c8935 100644 --- a/net/nfc/llcp_commands.c +++ b/net/nfc/llcp_commands.c @@ -337,8 +337,6 @@ int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock) struct nfc_dev *dev; struct nfc_llcp_local *local; - pr_debug("Sending DISC\n"); - local = sock->local; if (local == NULL) return -ENODEV; @@ -362,8 +360,6 @@ int nfc_llcp_send_symm(struct nfc_dev *dev) struct nfc_llcp_local *local; u16 size = 0; - pr_debug("Sending SYMM\n"); - local = nfc_llcp_find_local(dev); if (local == NULL) return -ENODEV; @@ -399,8 +395,6 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) u16 size = 0; __be16 miux; - pr_debug("Sending CONNECT\n"); - local = sock->local; if (local == NULL) return -ENODEV; @@ -475,8 +469,6 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) u16 size = 0; __be16 miux; - pr_debug("Sending CC\n"); - local = sock->local; if (local == NULL) return -ENODEV; diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index eaeb2b1cfa6a..5ad5157aa9c5 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -45,8 +45,6 @@ static void nfc_llcp_socket_purge(struct nfc_llcp_sock *sock) struct nfc_llcp_local *local = sock->local; struct sk_buff *s, *tmp; - pr_debug("%p\n", &sock->sk); - skb_queue_purge(&sock->tx_queue); skb_queue_purge(&sock->tx_pending_queue); @@ -1505,9 +1503,8 @@ void nfc_llcp_recv(void *data, struct sk_buff *skb, int err) { struct nfc_llcp_local *local = (struct nfc_llcp_local *) data; - pr_debug("Received an LLCP PDU\n"); if (err < 0) { - pr_err("err %d\n", err); + pr_err("LLCP PDU receive err %d\n", err); return; } diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 82ab39d80726..6fd873aa86be 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -930,8 +930,6 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); unsigned long nci_mode = NCI_DEACTIVATE_TYPE_IDLE_MODE; - pr_debug("entry\n"); - if (!ndev->target_active_prot) { pr_err("unable to deactivate target, no active target\n"); return; @@ -977,8 +975,6 @@ static int nci_dep_link_down(struct nfc_dev *nfc_dev) struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); int rc; - pr_debug("entry\n"); - if (nfc_dev->rf_mode == NFC_RF_INITIATOR) { nci_deactivate_target(nfc_dev, NULL, NCI_DEACTIVATE_TYPE_IDLE_MODE); } else { diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index e199912ee1e5..19703a649b5a 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -432,8 +432,6 @@ void nci_hci_data_received_cb(void *context, struct sk_buff *frag_skb; int msg_len; - pr_debug("\n"); - if (err) { nci_req_complete(ndev, err); return; @@ -547,8 +545,6 @@ static u8 nci_hci_create_pipe(struct nci_dev *ndev, u8 dest_host, static int nci_hci_delete_pipe(struct nci_dev *ndev, u8 pipe) { - pr_debug("\n"); - return nci_hci_send_cmd(ndev, NCI_HCI_ADMIN_GATE, NCI_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL); } diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index c5eacaac41ae..282c51051dcc 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -738,8 +738,6 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev, const struct nci_nfcee_discover_ntf *nfcee_ntf = (struct nci_nfcee_discover_ntf *)skb->data; - pr_debug("\n"); - /* NFCForum NCI 9.2.1 HCI Network Specific Handling * If the NFCC supports the HCI Network, it SHALL return one, * and only one, NFCEE_DISCOVER_NTF with a Protocol type of @@ -751,12 +749,6 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev, nci_req_complete(ndev, status); } -static void nci_nfcee_action_ntf_packet(struct nci_dev *ndev, - const struct sk_buff *skb) -{ - pr_debug("\n"); -} - void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) { __u16 ntf_opcode = nci_opcode(skb->data); @@ -813,7 +805,6 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) break; case NCI_OP_RF_NFCEE_ACTION_NTF: - nci_nfcee_action_ntf_packet(ndev, skb); break; default: From patchwork Tue Sep 7 12:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507820 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7D83C433EF for ; Tue, 7 Sep 2021 12:18:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DF5E60F45 for ; Tue, 7 Sep 2021 12:18:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344261AbhIGMTq (ORCPT ); Tue, 7 Sep 2021 08:19:46 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33452 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344099AbhIGMTb (ORCPT ); Tue, 7 Sep 2021 08:19:31 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0C11B4079B for ; Tue, 7 Sep 2021 12:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017105; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qR2mBzHAg4xNvGGzKLIBF7SEUJ5NOhEoyl3qE0updZ3W8SzdP48mLxO/jtC2D6+Ay SlIrRbexGDB5fO5v0Irf2kCxkRlP6PrIRsqf/czAGGA5ggJI3QSQrSa29sQa70jGJE LkhT8qhYTYwebXC+Z+Cw1XldYql3OUC0haqxWqNbWdn5Ux8V7H80BaWHTutEBxOcmH FKPzYC9NZ0tr5H35mcaFQ9UQcVbC/lV5hocLWILedAlyNPTj7tD1Wm2yAiXxoVNn62 ydTd+DHR7N0dCHNumCgVxvVp+jkvUet9RLHHJXV6JcOG1H6p+1bnRfYiO6GzugWnFs jQWjetbI+6vow== Received: by mail-wm1-f70.google.com with SMTP id c2-20020a7bc8420000b0290238db573ab7so1112983wml.5 for ; Tue, 07 Sep 2021 05:18:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; b=X6Zxe0p/ajMhMGm0j5kivhLQkTH5Azh85IKKae2l2k+dEqOqY2/T7nLbW105J0w8cl ib8Cu6Y304JypU61WGI9JKB9DyPmddIPhko6Rc3SvDOFHZgSimq2ArvbWpAV9O/aFS+R ND32FWVxOqkShXpK1C75tlnZteRsfDbgQRSrTvcfcsXlwEGtIHmFTYhVUDQBbY2TVSwD RFG4YdB2TyOnDhY3BuGJ9kBdS0EzcjrQRiD/dYop7ahHXvuwiuDdLzZQ/tHGTQAxDysj UtEQ4QU45rH4zFEiEqYmQA2rEOyWvNDToxxsWgCZ7vY5F53NmJcGwraRj3CAHI0ZoOhl FI2A== X-Gm-Message-State: AOAM5329IWHxQosaRQZeIHZ4Kx9dzpvY8YpU1Roq0cC7NUM83/P+Pi5X j6OdW/cYBXXaw6IEBxYPBqIPU3thkiEpQOg3tXxIKx5Y7V+06/wjnNoUEasxKt0JtMRHBEUSErs jIqTqqwj0LCU6ZOx5J+DiGwjuKFggepLOXg== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr3576590wml.127.1631017104502; Tue, 07 Sep 2021 05:18:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyB9lpSYRjC+nwBj78YNN3ZDlBL5vpXCZ8sbbrL5Cjob2y7j5eoJJP5w2OFbtm4kDLZhWgyyA== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr3576575wml.127.1631017104347; Tue, 07 Sep 2021 05:18:24 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:23 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 02/15] nfc: do not break pr_debug() call into separate lines Date: Tue, 7 Sep 2021 14:18:03 +0200 Message-Id: <20210907121816.37750-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove unneeded line break between pr_debug and arguments. Signed-off-by: Krzysztof Kozlowski --- net/nfc/hci/llc_shdlc.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 78b2ceb8ae6e..e90f70385813 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -201,8 +201,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr) del_timer_sync(&shdlc->t2_timer); shdlc->t2_active = false; - pr_debug - ("All sent frames acked. Stopped T2(retransmit)\n"); + pr_debug("All sent frames acked. Stopped T2(retransmit)\n"); } } else { skb = skb_peek(&shdlc->ack_pending_q); @@ -211,8 +210,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr) msecs_to_jiffies(SHDLC_T2_VALUE_MS)); shdlc->t2_active = true; - pr_debug - ("Start T2(retransmit) for remaining unacked sent frames\n"); + pr_debug("Start T2(retransmit) for remaining unacked sent frames\n"); } } @@ -518,12 +516,11 @@ static void llc_shdlc_handle_send_queue(struct llc_shdlc *shdlc) unsigned long time_sent; if (shdlc->send_q.qlen) - pr_debug - ("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n", - shdlc->send_q.qlen, shdlc->ns, shdlc->dnr, - shdlc->rnr == false ? "false" : "true", - shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr), - shdlc->ack_pending_q.qlen); + pr_debug("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n", + shdlc->send_q.qlen, shdlc->ns, shdlc->dnr, + shdlc->rnr == false ? "false" : "true", + shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr), + shdlc->ack_pending_q.qlen); while (shdlc->send_q.qlen && shdlc->ack_pending_q.qlen < shdlc->w && (shdlc->rnr == false)) { @@ -641,8 +638,7 @@ static void llc_shdlc_sm_work(struct work_struct *work) llc_shdlc_handle_send_queue(shdlc); if (shdlc->t1_active && timer_pending(&shdlc->t1_timer) == 0) { - pr_debug - ("Handle T1(send ack) elapsed (T1 now inactive)\n"); + pr_debug("Handle T1(send ack) elapsed (T1 now inactive)\n"); shdlc->t1_active = false; r = llc_shdlc_send_s_frame(shdlc, S_FRAME_RR, @@ -652,8 +648,7 @@ static void llc_shdlc_sm_work(struct work_struct *work) } if (shdlc->t2_active && timer_pending(&shdlc->t2_timer) == 0) { - pr_debug - ("Handle T2(retransmit) elapsed (T2 inactive)\n"); + pr_debug("Handle T2(retransmit) elapsed (T2 inactive)\n"); shdlc->t2_active = false; From patchwork Tue Sep 7 12:18:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507819 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9681C433FE for ; Tue, 7 Sep 2021 12:18:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0E1560F45 for ; Tue, 7 Sep 2021 12:18:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343809AbhIGMTy (ORCPT ); Tue, 7 Sep 2021 08:19:54 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33506 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343991AbhIGMTg (ORCPT ); Tue, 7 Sep 2021 08:19:36 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 1F31840790 for ; Tue, 7 Sep 2021 12:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017109; bh=ZvGFi5U4zjTh+pnHq+nIFd+NOwEdjR6IPvbXckjfAj8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CYmZKOFezy++0nWrJ0qjVWtfMiOWvQOpGEgJa5q4iKLsqlpefchLg23Ub/gM222S0 vVQuzstVUJJ55pPsrhd1xq2Bx7rGzjV3gZf5/0vcrLWpY1pTp68cmr9PwYZvneF12y N90H03myEkZCMusRkIjFmP5c0Dnc2pFnvISKyhwqp/WW9EJs8pQh2NwuaMiHRjeOjh JuWtop/COEI8b9xCAayiM7NnQXoNSIJNfPkBgWdLk4Qs/0IPL6OH+fhIajKyuyUozE 2IZBIpGmOyTH56mhmHku0agMe+UzlEkyp7b19JWY4yJpn2TqVc9+6V8Ng0yZGs416V mBUYOCCyXd9GA== Received: by mail-wm1-f70.google.com with SMTP id x125-20020a1c3183000000b002e73f079eefso1131674wmx.0 for ; Tue, 07 Sep 2021 05:18:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZvGFi5U4zjTh+pnHq+nIFd+NOwEdjR6IPvbXckjfAj8=; b=nFnFrn11lqS906XI3XSwlnUKLdTXXL/6z57taTksz2KTtbwkRbjOFR7TuS2q6PR/5f B4fQipkA8xhikZhKMBcQq1741Gz0phPXBJc5ip1HfTjLakgzV1RcG6tDPrxw6myZPd/X qSvNtv8BNZQywaOqGndl1qn03Hq09bfe8AymQ1/ncMhzAI7T6zPgLDn8Dv7mboJQQu55 lnNB7w1d/Av/Zf2ah3tvJNERuFK+Wg0RTTw72iXOnXk/XB6q7MZ+sIbD1HmyY5qWQPX8 EQ6JKgcRav8RsOp31sy9XeXacQfrdLULdnIGCXMqxESnQAMV4XZ+3vnSD4EgDBYvEi6x OPAw== X-Gm-Message-State: AOAM533ZcEv3+tJt+SuEq1zZx20UZd4dtBNsiraxXwZ/Cwz8tyAl9bVH BlPD5gBYXcHyAowIQcbE0Bex/m8c8IrVIs3JB37TcsQgvT3lG2m9rJRUIVA+SJ37w16a/RPUIic 2MmnQNbn2HC+hpOqvUB7BpbloKa+FRuA6ZQ== X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr18866635wrb.288.1631017108010; Tue, 07 Sep 2021 05:18:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPP0rxMIlB99OlQytxsYXswgaB3Zazfam9ab+Im0W3DSjzmYqWwvuiOBFhSweZVXznCZOlRw== X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr18866621wrb.288.1631017107888; Tue, 07 Sep 2021 05:18:27 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:27 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 05/15] nfc: pn533: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:06 +0200 Message-Id: <20210907121816.37750-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn533/i2c.c | 1 - drivers/nfc/pn533/pn533.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index e6bf8cfe3aa7..91d4a035eb63 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -138,7 +138,6 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data) } client = phy->i2c_dev; - dev_dbg(&client->dev, "IRQ\n"); if (phy->hard_fault != 0) return IRQ_HANDLED; diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index 2f3f3fe9a0ba..c5f127fe2d45 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -1235,8 +1235,6 @@ static void pn533_listen_mode_timer(struct timer_list *t) { struct pn533 *dev = from_timer(dev, t, listen_timer); - dev_dbg(dev->dev, "Listen mode timeout\n"); - dev->cancel_listen = 1; pn533_poll_next_mod(dev); From patchwork Tue Sep 7 12:18:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507818 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDDB8C433EF for ; Tue, 7 Sep 2021 12:19:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB6B860F45 for ; Tue, 7 Sep 2021 12:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344584AbhIGMUR (ORCPT ); Tue, 7 Sep 2021 08:20:17 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:36972 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344183AbhIGMTi (ORCPT ); Tue, 7 Sep 2021 08:19:38 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id AD4AA4079B for ; Tue, 7 Sep 2021 12:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017111; bh=alAZCnXDBZFqFGCWdjT1NtYwVcFPW4mHC6+AQVNQmag=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=trlr4oC8LLuY5GeQkmvHgbJsYUtlqK9BukxXXgZehcZTvW+lLylO5H1FoHfVU4RHQ qIAb7rHlZFUJpfMJuHiwXDYuDjjdWh1S0TeH6qjenACrNrzK2JJdwuRtUjLa0vh4Z7 PdVmQEJz8PFLICWDV1BkzqRHkM9deQdBgPYvdrlHngODvLJxksmuJhe8rivaeuCod3 34LP/rzzXApaDTTc8nvyAD/xoeDhGnVjjncnRFaKSGr6jh9moGDyUqGrJax0j+tDIL KabZ+QGFTrv0SML9Uk+unL1eM6+kSoMmjRxkwStkkSwNzq97krA5Ikz/qvd+7PeEok bsEIbaJyLIVLw== Received: by mail-wm1-f71.google.com with SMTP id p11-20020a05600c204b00b002f05aff1663so1039085wmg.2 for ; Tue, 07 Sep 2021 05:18:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=alAZCnXDBZFqFGCWdjT1NtYwVcFPW4mHC6+AQVNQmag=; b=PZtBfE9+gNn0zGfGufqRnZjcnDdTwTKlFPphJtf2v3jICArrKorJv3TyJ67a2lMOfH 3H0lOWWoxVeDi90J6zsJRBLGySej7pYh7WBJwyYJ5xpOlqxxRDLPJFMQY/esF0/9tRWm Iccy3XyC1JIQcrhfqEBczmWRpnbxdihW3mYatqJAzmPjbQeREc9yMjmFmoRwVW8CG3Lz iMjMOoDdncdQCUCnV1bhWy+0W9fKd9kKR+xx7QXTfZkblrXFs0L3fZLPrKWH7jTmBCK4 N1WGHQb0/S79McKYrBPSEKkImHgifQnoQgnXQNSMpdvRowIska1AohC1m99GaIjGn9tB /aXQ== X-Gm-Message-State: AOAM530hH4nPnYbZf3YmOVsA2l4LQqjgIF8mnsAJUk/lrudWby+iZNya lLN3EdYCrcpH6SSWDDssW8pGEbLkjq8qeHvpEvB+K/KpkbqJDkl1fN2fM10xllo/f+xMBf2qqWX Trl2amkHBjom3Wzs10N2cNwrDDFtyc9eJBg== X-Received: by 2002:a7b:c4d2:: with SMTP id g18mr3717620wmk.135.1631017111462; Tue, 07 Sep 2021 05:18:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSzLNNlEK8DFo/MnzQggQYeVU3xGdFUyuK/8MdNZjNchdqevSP20XoztHRWZaK3JDeEdaRWA== X-Received: by 2002:a7b:c4d2:: with SMTP id g18mr3717597wmk.135.1631017111286; Tue, 07 Sep 2021 05:18:31 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:30 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 08/15] nfc: pn544: drop unneeded memory allocation fail messages Date: Tue, 7 Sep 2021 14:18:09 +0200 Message-Id: <20210907121816.37750-9-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org nfc_mei_phy_alloc() already prints an error message on memory allocation failure. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn544/mei.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c index a519fa0a53e2..c493f2dbd0e2 100644 --- a/drivers/nfc/pn544/mei.c +++ b/drivers/nfc/pn544/mei.c @@ -23,10 +23,8 @@ static int pn544_mei_probe(struct mei_cl_device *cldev, int r; phy = nfc_mei_phy_alloc(cldev); - if (!phy) { - pr_err("Cannot allocate memory for pn544 mei phy.\n"); + if (!phy) return -ENOMEM; - } r = pn544_hci_probe(phy, &mei_phy_ops, LLC_NOP_NAME, MEI_NFC_HEADER_SIZE, 0, MEI_NFC_MAX_HCI_PAYLOAD, From patchwork Tue Sep 7 12:18:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EA4DC433FE for ; Tue, 7 Sep 2021 12:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C212610F8 for ; Tue, 7 Sep 2021 12:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344707AbhIGMU1 (ORCPT ); Tue, 7 Sep 2021 08:20:27 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:36930 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344335AbhIGMTv (ORCPT ); Tue, 7 Sep 2021 08:19:51 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4185740191 for ; Tue, 7 Sep 2021 12:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017113; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=THvlgJJVPUdS2G4htPrdV0Btl9JrJh9fDSBov0j9gWIRmyu4+OsgSd/dK3DUp2jn2 CLSvm5lBdBBU5P+2DqGMF6n0lS+pzfN7PbB32lKw8/EA0H8xzA9u0fe4kzT+Ud7RgM P9emRigwDxIeS6iMe0iLXGCnlveUChycCN2fO0RIK3Qte8zWeWVgJBY9Bu3ngYgvpL AwPSDFRMp1SW6ReSSJDpUs1+tJk7Yq6jSXZ8dP3uEZXP4AyL8PO7RY0HDOJudrbnoz HUowv9VvGCY8ZP/SIAtUsYf9EVgT5FCGNFSQKL/xVsKVPw90DlkY1W2kPFlBtpF6la W82n2xBhM8pZQ== Received: by mail-wm1-f72.google.com with SMTP id u14-20020a7bcb0e0000b0290248831d46e4so1033142wmj.6 for ; Tue, 07 Sep 2021 05:18:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; b=Zz+OipIcSRoS1jDSWV3OZM7rk9/OIj1m98PxpdqWEiY0oWy77loczMviQYr5DQMKQU UX4Z5JphedwOj+6W/rnSCK+K60Xl2QEdvR/WDuQofyH4Gpcq2eA7Ep5y8QgxP79RCeyP 5j3TFxaEXncpxGnvGmjFD3whYiRwEl35/aLMvO1TQnI5skapOzLuOC23q0OhEcj0IjoU wZWyv2S5lQcH1nMLhgYkoORcVilHd5DIf0lTXhe6H2azyZUrxmI2I7mSln2VQm2/VTUc Qvvhko8RvCPWtiNv3Jonc0KNuf09UADBNadDMQc3TcmmhG0m04IdtQNO/bfyS6/2iW4+ S6Yg== X-Gm-Message-State: AOAM532MKzCXA7/+9jfKtU7ACvdjYpUyPKSl0UDrcp88ERk0W31yOwNM d7qTYC8Wj/hWGw4a4v6YT214Wwlw/BNOlVkTSiD7vnu4yQP7pSv1KV5Q9+dIZu0L2cNWFmse3z7 WOyXKNbQSUz4SNSLUfYrfDcZln1FD5yzZcw== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625643wmk.172.1631017112940; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIRJRBnXqqRi/FyU10IMJdS2aVEiOt1XxAF7EDlHa+Uo5rJJxXcKVpKNVHaNkiAm/uo8/TUg== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625633wmk.172.1631017112788; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:32 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 09/15] nfc: s3fwrn5: simplify dereferencing pointer to struct device Date: Tue, 7 Sep 2021 14:18:10 +0200 Message-Id: <20210907121816.37750-10-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify the code dereferencing several pointers to reach the struct device. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/firmware.c | 29 +++++++++++------------------ drivers/nfc/s3fwrn5/nci.c | 18 +++++++----------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index 1af7a1e632cf..c20fdbac51c5 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -357,6 +357,7 @@ s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo; int ret; @@ -364,8 +365,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Failed to get bootinfo, ret=%02x\n", ret); + dev_err(dev, "Failed to get bootinfo, ret=%02x\n", ret); goto err; } @@ -373,8 +373,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_base_addr(&bootinfo, &fw_info->base_addr); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unknown hardware version\n"); + dev_err(dev, "Unknown hardware version\n"); goto err; } @@ -409,6 +408,7 @@ bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_image *fw = &fw_info->fw; u8 hash_data[SHA1_DIGEST_SIZE]; struct crypto_shash *tfm; @@ -421,8 +421,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) tfm = crypto_alloc_shash("sha1", 0, 0); if (IS_ERR(tfm)) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot allocate shash (code=%pe)\n", tfm); + dev_err(dev, "Cannot allocate shash (code=%pe)\n", tfm); return PTR_ERR(tfm); } @@ -430,21 +429,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) crypto_free_shash(tfm); if (ret) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot compute hash (code=%d)\n", ret); + dev_err(dev, "Cannot compute hash (code=%d)\n", ret); return ret; } /* Firmware update process */ - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: %s\n", fw_info->fw_name); + dev_info(dev, "Firmware update: %s\n", fw_info->fw_name); ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data, SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to enter update mode\n"); + dev_err(dev, "Unable to enter update mode\n"); return ret; } @@ -452,21 +448,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_update_sector(fw_info, fw_info->base_addr + off, fw->image + off); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Firmware update error (code=%d)\n", ret); + dev_err(dev, "Firmware update error (code=%d)\n", ret); return ret; } } ret = s3fwrn5_fw_complete_update_mode(fw_info); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to complete update mode\n"); + dev_err(dev, "Unable to complete update mode\n"); return ret; } - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: success\n"); + dev_info(dev, "Firmware update: success\n"); return ret; } diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c index e374e670b36b..ca6828f55ba0 100644 --- a/drivers/nfc/s3fwrn5/nci.c +++ b/drivers/nfc/s3fwrn5/nci.c @@ -47,6 +47,7 @@ const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = { int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) { + struct device *dev = &info->ndev->nfc_dev->dev; const struct firmware *fw; struct nci_prop_fw_cfg_cmd fw_cfg; struct nci_prop_set_rfreg_cmd set_rfreg; @@ -55,7 +56,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) int i, len; int ret; - ret = request_firmware(&fw, fw_name, &info->ndev->nfc_dev->dev); + ret = request_firmware(&fw, fw_name, dev); if (ret < 0) return ret; @@ -77,13 +78,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) /* Start rfreg configuration */ - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: %s\n", fw_name); + dev_info(dev, "rfreg configuration update: %s\n", fw_name); ret = nci_prop_cmd(info->ndev, NCI_PROP_START_RFREG, 0, NULL); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to start rfreg update\n"); + dev_err(dev, "Unable to start rfreg update\n"); goto out; } @@ -97,8 +96,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_SET_RFREG, len+1, (__u8 *)&set_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "rfreg update error (code=%d)\n", ret); + dev_err(dev, "rfreg update error (code=%d)\n", ret); goto out; } set_rfreg.index++; @@ -110,13 +108,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_STOP_RFREG, sizeof(stop_rfreg), (__u8 *)&stop_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to stop rfreg update\n"); + dev_err(dev, "Unable to stop rfreg update\n"); goto out; } - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: success\n"); + dev_info(dev, "rfreg configuration update: success\n"); out: release_firmware(fw); return ret; From patchwork Tue Sep 7 12:18:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9563FC433FE for ; Tue, 7 Sep 2021 12:19:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81967610F8 for ; Tue, 7 Sep 2021 12:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344650AbhIGMUW (ORCPT ); Tue, 7 Sep 2021 08:20:22 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:37086 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344344AbhIGMTv (ORCPT ); Tue, 7 Sep 2021 08:19:51 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id AB1E24079D for ; Tue, 7 Sep 2021 12:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017114; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P8NE7jktgFoRLcAw9YKtpxd9cyE05iHpHlXZKxAUKWliYfHfNx+dRXd5HrDcc+eN1 7hdkaH7Q1qRKVmOT9IyEaWQ+0p74/V9ICAYjpS+I11GDYZOI7IYYKZYLe2nDK+0qqE Lxler81NbAzvSk7rcIFlf//Xxa+TcYFHWh81Dv1WzUTUWxR0BlgZdcrM0qGtEqkZyp n00Wm9C5NZaKciupQNoBaRqeqCT8VYM57UD04Lh7oZ2W5S8fv3N+Q08FwOBgNAEm8U /JGztzo5iSGrp06CAcqRGril2z+xNHQM2JmGvw8zSoY100B6Pfd73lHEggtbTBM9Uu sJehb81J6fnjA== Received: by mail-wr1-f71.google.com with SMTP id j1-20020adff541000000b001593715d384so2046582wrp.1 for ; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; b=tOgsi4uX6kv11KGhxzCzZ92wRFMK/AO9LnkFCLpgXWwivVpKM4CuSdE13W0mWQBbPV 6Y6hyo+QjeuQhU8MoXTcyop/4BlpmI8OBLM89/XoC6QiroEZuIRxh4knZs2lMeHK4ZYe N8jrhw7dFZWlhdxXgNXZs+Nv43vDWWynY1WvneRoOpHYDykLhYNC81Gk3EBoN9Z5+q9C x1vnkKKWYEuDj5iZDDop+Y811prJLrQ9miQKHgojgHuKguRZXjIT0Oka/cgoo8LAkOQV QxK8kvl4s4q5vZAuYgS+xvWk1JwCHJ72ehpjtZupMS68UFdvRl+ULY/urLl3OBS1fOAC UasA== X-Gm-Message-State: AOAM531FfIyJ+nnhj1wlcFeWKFNr0o0ZIB4TZJwNa2yOJKrijsVqvDn8 v2cIxgTDSrBVesV+5US6ybpPug9sVwCgPMeduKcTzEaZSDTjrUZN/mH/2fAZC0FjIUStyqPML6O h13ytp2RFotaTcGMGt5yRf8ySlh+c6AzwMA== X-Received: by 2002:a05:600c:22d2:: with SMTP id 18mr3809630wmg.57.1631017114368; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5jtNrITmHBDgLaBbxdrMwDPzRPd9HWI65g33beGxYwDoKNU0TPfWLbynhjY+3UZBxDrACFA== X-Received: by 2002:a05:600c:22d2:: with SMTP id 18mr3809616wmg.57.1631017114195; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:33 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 10/15] nfc: st-nci: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:11 +0200 Message-Id: <20210907121816.37750-11-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/st-nci/i2c.c | 4 ---- drivers/nfc/st-nci/ndlc.c | 4 ---- drivers/nfc/st-nci/se.c | 6 ------ drivers/nfc/st-nci/spi.c | 4 ---- 4 files changed, 18 deletions(-) diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index ccf6152ebb9f..cbd968f013c7 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -157,7 +157,6 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) { struct st_nci_i2c_phy *phy = phy_id; - struct i2c_client *client; struct sk_buff *skb = NULL; int r; @@ -166,9 +165,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - client = phy->i2c_dev; - dev_dbg(&client->dev, "IRQ\n"); - if (phy->ndlc->hard_fault) return IRQ_HANDLED; diff --git a/drivers/nfc/st-nci/ndlc.c b/drivers/nfc/st-nci/ndlc.c index e9dc313b333e..755460a73c0d 100644 --- a/drivers/nfc/st-nci/ndlc.c +++ b/drivers/nfc/st-nci/ndlc.c @@ -239,8 +239,6 @@ static void ndlc_t1_timeout(struct timer_list *t) { struct llt_ndlc *ndlc = from_timer(ndlc, t, t1_timer); - pr_debug("\n"); - schedule_work(&ndlc->sm_work); } @@ -248,8 +246,6 @@ static void ndlc_t2_timeout(struct timer_list *t) { struct llt_ndlc *ndlc = from_timer(ndlc, t, t2_timer); - pr_debug("\n"); - schedule_work(&ndlc->sm_work); } diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 5fd89f72969d..7764b1a4c3cf 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -638,8 +638,6 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, { struct st_nci_info *info = nci_get_drvdata(ndev); - pr_debug("\n"); - switch (se_idx) { case ST_NCI_ESE_HOST_ID: info->se_info.cb = cb; @@ -671,8 +669,6 @@ static void st_nci_se_wt_timeout(struct timer_list *t) u8 param = 0x01; struct st_nci_info *info = from_timer(info, t, se_info.bwi_timer); - pr_debug("\n"); - info->se_info.bwi_active = false; if (!info->se_info.xch_error) { @@ -692,8 +688,6 @@ static void st_nci_se_activation_timeout(struct timer_list *t) struct st_nci_info *info = from_timer(info, t, se_info.se_active_timer); - pr_debug("\n"); - info->se_info.se_active = false; complete(&info->se_info.req_completion); diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c index a620c34790e6..af1f04c306cc 100644 --- a/drivers/nfc/st-nci/spi.c +++ b/drivers/nfc/st-nci/spi.c @@ -169,7 +169,6 @@ static int st_nci_spi_read(struct st_nci_spi_phy *phy, static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) { struct st_nci_spi_phy *phy = phy_id; - struct spi_device *dev; struct sk_buff *skb = NULL; int r; @@ -178,9 +177,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - dev = phy->spi_dev; - dev_dbg(&dev->dev, "IRQ\n"); - if (phy->ndlc->hard_fault) return IRQ_HANDLED; From patchwork Tue Sep 7 12:18:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507815 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD2E2C433FE for ; Tue, 7 Sep 2021 12:19:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 928A7610F8 for ; Tue, 7 Sep 2021 12:19:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344835AbhIGMUi (ORCPT ); Tue, 7 Sep 2021 08:20:38 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33702 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344346AbhIGMTw (ORCPT ); Tue, 7 Sep 2021 08:19:52 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0921840779 for ; Tue, 7 Sep 2021 12:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017118; bh=AKOLSiNotprej29rkzU07CereuPK7jDMwjY+iTyzzwA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HFklzmnP9rTq9LMetMxwEr9i1bDD5hHmIqw5uu274s1r8Uf+oLJTxZtOocBDrf5jm yH1mhPaWN+VeYCAxy2sfZ7/aFp7MS2iojNdSAWeuPD9qAIAtNiBZxPtnW2Rca7yNRJ AyEcYKW6rnsYpvCz6sSTykeW/xY5FLzvfYf/9ctdoeuZMjIECe3hPvdI6aDYwIossl a8goohdPd/dnNfzWMR9NtfWhioG6ZiDu+R6W/mWuyIN13rYSF9Of6Zljy/PLpUwoYZ XcMwvv0Egboeb1j7FctJqKa/AmN4oxJlbPDjOaHAacgbnAOVjBVQgtYWUjKO/imTi1 KqxV2Nps2WIQA== Received: by mail-wm1-f70.google.com with SMTP id r126-20020a1c4484000000b002e8858850abso3325877wma.0 for ; Tue, 07 Sep 2021 05:18:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AKOLSiNotprej29rkzU07CereuPK7jDMwjY+iTyzzwA=; b=Fxrz8P0GEPnxk632xGHOk16cNPIrJrkpH7ek9Z6Nk7Yn5pr3u0myDoPjyBmwFJ9QzJ 95tob7U40jyHAgcMB+yJlTybi5o1B2DDnodPUZ6nb3gMFReeTS2ZScKe+wUg1cB9wyic bDMyIcjxtGh9PYWqo9wlwVJU9lESV+f23ygsju7HnuxdLGOufyrJT3zs6rAOfswVgN80 ntjlKuESbgLYXmHRMeqVFvIg/hyeYpTlcsG184qOVVejJXeOAykPt+uTyGbPkW2VNu0S cAk2974epvBjTQYQ0XOi4qaF/OruVy7B55YF54L9yxTf0fb9VE8ArkHkF/s/FMnbMmn7 EtzA== X-Gm-Message-State: AOAM532w3LFn1GOHa2bRiF0LMhoYsV40E9L4DKbwq7/j42mRzmODMcJD Yxr6l5dsk1fpbxediq3jdLEAu6jvvTY0qX9fjz7NxdQv0Unt73Ff2OSjvr+OmOAbcD7GweBlSm5 SjEfgdqWLaLWDLv9KG12MuACE9Fz9RItxeQ== X-Received: by 2002:a5d:4ec5:: with SMTP id s5mr18813221wrv.267.1631017117795; Tue, 07 Sep 2021 05:18:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVLcRdCI3iDjK/G4gORzXajvhzjEDqB6WvYfzQBGQHCjdeU0byAvmPWP02UqU4TwnqzrjuVw== X-Received: by 2002:a5d:4ec5:: with SMTP id s5mr18813203wrv.267.1631017117668; Tue, 07 Sep 2021 05:18:37 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:37 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 13/15] nfc: microread: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:14 +0200 Message-Id: <20210907121816.37750-14-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/microread/i2c.c | 4 ---- drivers/nfc/microread/mei.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c index 86f593c73ed6..067295124eb9 100644 --- a/drivers/nfc/microread/i2c.c +++ b/drivers/nfc/microread/i2c.c @@ -237,8 +237,6 @@ static int microread_i2c_probe(struct i2c_client *client, struct microread_i2c_phy *phy; int r; - dev_dbg(&client->dev, "client %p\n", client); - phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy), GFP_KERNEL); if (!phy) @@ -262,8 +260,6 @@ static int microread_i2c_probe(struct i2c_client *client, if (r < 0) goto err_irq; - nfc_info(&client->dev, "Probed\n"); - return 0; err_irq: diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 8edf761a6b2a..686be3381727 100644 --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c @@ -23,8 +23,6 @@ static int microread_mei_probe(struct mei_cl_device *cldev, struct nfc_mei_phy *phy; int r; - pr_info("Probing NFC microread\n"); - phy = nfc_mei_phy_alloc(cldev); if (!phy) { pr_err("Cannot allocate memory for microread mei phy.\n"); From patchwork Tue Sep 7 12:18:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507814 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0A64C433FE for ; Tue, 7 Sep 2021 12:19:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB985610FF for ; Tue, 7 Sep 2021 12:19:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344510AbhIGMVB (ORCPT ); Tue, 7 Sep 2021 08:21:01 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33710 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344497AbhIGMUC (ORCPT ); Tue, 7 Sep 2021 08:20:02 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A0A954079E for ; Tue, 7 Sep 2021 12:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017120; bh=IGi454bY1uM8p5QRZSKGDo9YXvHCL/LufQFtzz+SznM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BKgQmkFGobUvYp4GFsCJgQW/pS4+dZHWtVS2CgD0+/SI7oAylF4qKPMClkPE2XS9K KiZgUKdoGhiybUMClbmES0ASH/vud9PeZBpFkNjWyNt1E5o1XhJkp7Rpx++N8C3zW6 Ho1loJ4DQ2kx8RN6QMF24nvlqOSbTPQAKgfAid2UyNRputTZHAaoQs+OO5q23+jOtk x6M9WFETDet2o8tUchLOwI9jxOtL8VKItU8ahicahuLk/ImV0VX/13u7+cHFhCxhbQ ZXqRG6pQpbHxYhkM5caBjQto37Wy/nRNpkqVFkWT+0GhNR+RcCyPMu8vz/LMs5nc6E 2oXBE6+0V5CTw== Received: by mail-wr1-f72.google.com with SMTP id t15-20020a5d42cf000000b001565f9c9ee8so2055596wrr.2 for ; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IGi454bY1uM8p5QRZSKGDo9YXvHCL/LufQFtzz+SznM=; b=L2S4VNWzSnOh3/HUN6pf9n2wotZURKz1tFLQnz3bkcjdC2Pi7dhWafA6uWDTz6MWIk dX/mIbFcAPwO/ks1DoGd3a+s6KClH6m2GRJN0iPiHP5OHD9VJVEbPkhHtdrO/Cx/J0ke 5Lj1lbkQORj1EP3lpOP83+1KGjmGrP/RdYlmcs2uUVfw4flCG+8RtqczuOaW0i+z9HFq Ch7cy5323ju66Z3g28vfAbyxhgPU9+Bray1J6BgNqx/WBfi78/xFl33xk7Sz69A7eQGY iewsZeezVfdrMl86epFuXNjXT1a1c+OcezGWOItmU3rBPVKBrxB+lcnjo1meaew4UrTi h/jQ== X-Gm-Message-State: AOAM531lH7G6BYzrPSUuOJh1CUbKJM6aXpbK1z+aE5q0CL6eR2CGEUe9 rNIJN/5IGkEPr9e2tfwH9t5ZTRw1x7VV8kb3Ul1r779VP2pb7SqV2CtUPcb5V35mOZXwOcpUohW 1cvdcv+AfmnNqA7jlza2gEqtQCJS9OnONfg== X-Received: by 2002:a05:600c:1d27:: with SMTP id l39mr3629441wms.146.1631017120415; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzkQReT6hqXvnsRi4xVMvPv5mwLHDY/KqHilLqyCDbOJpRRpQ8tjRRU7brxn8w70vPDRKkmA== X-Received: by 2002:a05:600c:1d27:: with SMTP id l39mr3629425wms.146.1631017120289; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:39 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 15/15] nfc: mrvl: drop unneeded memory allocation fail messages Date: Tue, 7 Sep 2021 14:18:16 +0200 Message-Id: <20210907121816.37750-16-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org nci_skb_alloc() already prints an error message on memory allocation failure. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/nfcmrvl/fw_dnld.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c index edac56b01fd1..e83f65596a88 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -76,10 +76,8 @@ static struct sk_buff *alloc_lc_skb(struct nfcmrvl_private *priv, uint8_t plen) struct nci_data_hdr *hdr; skb = nci_skb_alloc(priv->ndev, (NCI_DATA_HDR_SIZE + plen), GFP_KERNEL); - if (!skb) { - pr_err("no memory for data\n"); + if (!skb) return NULL; - } hdr = skb_put(skb, NCI_DATA_HDR_SIZE); hdr->conn_id = NCI_CORE_LC_CONNID_PROP_FW_DL;