From patchwork Mon Sep 13 13:20:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510281 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.7 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 BAC8CC433EF for ; Mon, 13 Sep 2021 13:31:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A162B6154B for ; Mon, 13 Sep 2021 13:31:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242108AbhIMNai (ORCPT ); Mon, 13 Sep 2021 09:30:38 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:57710 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240932AbhIMNV7 (ORCPT ); Mon, 13 Sep 2021 09:21:59 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.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 366C340265 for ; Mon, 13 Sep 2021 13:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539243; bh=cs5MWRb4M9tfwP6GV7LH4BPGBlEq/OdD8zQOU93qEGI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GR2bePmaj7WHRMOQZOKKwFcDtvnGOv/9VUhFeeLXGdOdqkXbZIiMb6ny7QWE1AOiT l10/BEycIVdvCBpfDvCDq4gQmE8kSXgSdgM46gmKQkn7c7nbRR1X9HFUvaX1iklwgL D1xAYPXbQ2arKr99yIySoVAGblH9FdIUhKqt1nlE/TqgI0Vis2d8l+c0uSzkOOwxV9 xfmoMIpXAf7+Vy4kdDldl6mWyUcnG1KLowWywtscEvpC07opVhLix1et5OJLDB2vYu hmU4IoohS4n/DjMFGwB5YXlyfwBJBfgTwbxPTmBGbXksifdxv63j2zIaJV7dx5xvXk /s3MRhHBPMl3A== Received: by mail-wr1-f70.google.com with SMTP id q14-20020a5d574e000000b00157b0978ddeso2656489wrw.5 for ; Mon, 13 Sep 2021 06:20:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cs5MWRb4M9tfwP6GV7LH4BPGBlEq/OdD8zQOU93qEGI=; b=F1ac1X8CiJ3OqgWTRRRf20Mew2QBfO11j2Pdipp10nS0/XgqG+Ae4ItHAqwc1howSb ssY0WJfYUKOV+WaoDiRo8c7Lxz+eL/ap2vU82sk6mFWwtmt3FpA6RWrVYwVASrgry32f 86kSiYQDOmWgikImJsc69Hi84GPtRAgX5ZjXle/R8ajxjtTLgpUaCQt7XQkxZWFhQB/U 8qBlj/gZzyLfO22ku7SjWcUa7p12aF8/Sx44oSQKyWzJFXTpT781gzkcdLrW1ED+Krln VYdpbt8RKHF+kWT7yLGVCvrmWnYPz7bja4TEWaXoQPV7LB+y/4JjuCfz1ONo8ryyM5eS xSGg== X-Gm-Message-State: AOAM531l3D1ua8KN2xHLxhdt0J7QpBbKJBZFbeOrIDqEuXpiOr4OhNt9 EKyx3ese3sqqpIUyTrDCA2pJySafBeVAvglKf6iltRKx+92AEPkbo8k3VTPRQGa2uD8Hiwkw/l2 MbNR1LBx0zkLG8AJkccrkbsKpRo5Qa1gL9Q== X-Received: by 2002:adf:b319:: with SMTP id j25mr8069924wrd.256.1631539242741; Mon, 13 Sep 2021 06:20:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5v4bayWSPxe/obNJPWhLd/yMiByG5JX8dkQyRTvyg7xiWBHVKbEBAdMX4lrRhGZ+UcTaROg== X-Received: by 2002:adf:b319:: with SMTP id j25mr8069894wrd.256.1631539242510; Mon, 13 Sep 2021 06:20:42 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:41 -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 v2 01/15] nfc: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:21 +0200 Message-Id: <20210913132035.242870-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510287 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.7 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 435B0C433EF for ; Mon, 13 Sep 2021 13:24:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 276C96121E for ; Mon, 13 Sep 2021 13:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241813AbhIMNZx (ORCPT ); Mon, 13 Sep 2021 09:25:53 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34138 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241153AbhIMNX0 (ORCPT ); Mon, 13 Sep 2021 09:23:26 -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 7D2434026D for ; Mon, 13 Sep 2021 13:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539245; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fdf45LTIcq4mY7uCJUaLFAQgCz3vWBx/FnEVwAbo+Hj+B5/BPnnEAD+bWjqq2YjMh +tI44rlwaDSfR4mh3WTwH83F+cW1xaWLJTLe7GG+tERPiOSL2bZgYuZFwC8pcpAHqy wSp/Ygf+Yr7bwMHj/HF4Bzv7+FA+pyuvQzDDA05nDTdWqKZ7vnneCwQsu6FQuzFh5L LbRnOeS5W0ifR1vRwmWIV4Bxw2sX+ZNpiPKFBhURZE3XGWy2fcHCtxU6O6BH2JtWdy 576PwalssVDl8qDDtEPmMGs61LQj9gbkvgmra1rTcJzut9OsMSr1/vEy9pheoLcr5q Nf4FpLtwRQygA== Received: by mail-wm1-f72.google.com with SMTP id a144-20020a1c7f96000000b002fee1aceb6dso4926269wmd.0 for ; Mon, 13 Sep 2021 06:20:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; b=BHytkDuPgty6RjUfGspGPFz+bSJdG8Rzp0qy7m/hBUZb5YSoD4p2pTqATHGOMWGH3X utTbChBIMYQXiUv7pSxr/oS3/A+KwA4deQ/4nqnfcCAkWJ5CtwjhzoeGETo7yS0/bQiJ rCxrLmhJ6wlSV4BKSY2lrA/tZrVomg0Q3WwNXwSedt6Jb3ss6ChoVNGcUwP+ICgOGKX6 ZAoF7Ac4wwFdCDLuzzXSXbhza4/Of4ENKKCjBkcnT1rCPXL0pwTwuqH5wh5upHShP8lk oHawiA8VOpYYZNd3Rsl023KJtJehsF6PeL6Qz9gzI2qBCvu/t9yc/9TzH4d5Go6Wyw/6 skgA== X-Gm-Message-State: AOAM5310ctxGAPVX3qUFOMcl20ETb3bxJ6WIiBwH+V80OUwiiNFWXPjD uWGNUF3kOzf7clc4gOL7uLpMF17x/9vX5cuSlNAV4jigBigKZ0sCExqqf4xOgZ0/fdyWI14LG2n +FEyyK9VJvrGdlW2n4mi2i496W8Cex2UDzw== X-Received: by 2002:adf:fb07:: with SMTP id c7mr12251639wrr.399.1631539244940; Mon, 13 Sep 2021 06:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzILgpQkYxJU/M3MzweCeFPT+kDGa1TnDYwi3heoPxDFjyRATx52X0us/D5TSUHmIkvEVgWw== X-Received: by 2002:adf:fb07:: with SMTP id c7mr12251611wrr.399.1631539244768; Mon, 13 Sep 2021 06:20:44 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:43 -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 v2 02/15] nfc: do not break pr_debug() call into separate lines Date: Mon, 13 Sep 2021 15:20:22 +0200 Message-Id: <20210913132035.242870-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511608 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.7 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 DE2A1C433FE for ; Mon, 13 Sep 2021 13:31:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C578D6147F for ; Mon, 13 Sep 2021 13:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237920AbhIMNal (ORCPT ); Mon, 13 Sep 2021 09:30:41 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:57740 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240595AbhIMNWD (ORCPT ); Mon, 13 Sep 2021 09:22:03 -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 C015440264 for ; Mon, 13 Sep 2021 13:20:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539246; bh=Lf3U+DHYhMpuIl7nTJH6GPAYe+llXfLG7+wtuS7r1DY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C9UVcbIUq3O4jN/3iHXwE6SSuKueuzAPU+yMYAhssYEWhd+HFJKX9NQCyZeGXBBm0 i542P4TyYCPz9wzsaKw1+fcRKbXbNbDzmnsgaPX6BuyUYa8Hr+Bq+kRESdzohlzahQ zzqQAtkNcArCVaQEdKTWb0HvdE/bhhQ4fkEG1Su94IviI5ofwt3RNBlTGsY1kLN+Xm G5gh62mfmk1AcRG82xVUhZV+pb5cd7YldXe96TNdn8LBXR6zEx9Hf1f1lHL5gaY2hz oYRQK7bN1s9aoNeXAb7oNZeAXtUYB54cpWYSIe0NfD9ynDM9aPioGj45N93QuqxO9G +6TFKvJ63c5Fw== Received: by mail-wm1-f70.google.com with SMTP id 5-20020a1c00050000b02902e67111d9f0so4912823wma.4 for ; Mon, 13 Sep 2021 06:20:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lf3U+DHYhMpuIl7nTJH6GPAYe+llXfLG7+wtuS7r1DY=; b=szR19Crz0Rj5WtzViubzl1odTiHZsJM86Uuj0zuM+3VMDTPhXoTQObG6cTcIm5q7mC 8g79bkGeOvr020Y59XEWnPvkRBhly2BDvwY7q8i30mZhwUF6zw8Pr7tTddfEFhywyeeK rn7NmIUzAX6UmNZw0r7tc7mXtXH735g5sAm0iXCoDqiheil+mawXXN4MOBOORJJWHaf2 wj00pq6/OMokPVq+LAoz3HTPGIS9wN/tYjTn0HU0mWX7dXlZAQapcMifuqhXs0Zz8Gqo May2tV/cgNKVUjFXXkxD9sxVSZurBvFXwZ29ezT2yaVMVuFxS/1wPEsGdVI+KpZT5ugF DIWw== X-Gm-Message-State: AOAM5303yEtoQoOUolZ8sPFDDSznPhF3Zd2CJOFhSxTbvW2LFv5ghVNJ 1MgPtJsFkwGQ9uX2+a0HXkWSJ+9eYiyRCrkN2QWmhT0IP3RCAAnWljyLXmi9FpekDkhjpdVSMOv T2aVB8A43Q+DwPJbEOjiZE7zXGDGKVftBfw== X-Received: by 2002:adf:f90f:: with SMTP id b15mr12528812wrr.364.1631539246422; Mon, 13 Sep 2021 06:20:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwO4lsG5wdmhKIDutLLy9acqil5ZkWEOWZw6YwdcZcxBYqUrgu1dwPeeITR5yS7gtM6A2hFVg== X-Received: by 2002:adf:f90f:: with SMTP id b15mr12528787wrr.364.1631539246274; Mon, 13 Sep 2021 06:20:46 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:45 -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 v2 03/15] nfc: nci: replace GPLv2 boilerplate with SPDX Date: Mon, 13 Sep 2021 15:20:23 +0200 Message-Id: <20210913132035.242870-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace standard GPLv2 only license text with SPDX tag. Signed-off-by: Krzysztof Kozlowski --- net/nfc/nci/uart.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index 502e7a3f8948..65814dd72618 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -1,20 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015, Marvell International Ltd. * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which - * is available on the worldwide web at - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about - * this warranty disclaimer. - */ - -/* Inspired (hugely) by HCI LDISC implementation in Bluetooth. + * Inspired (hugely) by HCI LDISC implementation in Bluetooth. * * Copyright (C) 2000-2001 Qualcomm Incorporated * Copyright (C) 2002-2003 Maxim Krasnyansky From patchwork Mon Sep 13 13:20:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511615 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.7 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 474E8C433EF for ; Mon, 13 Sep 2021 13:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25B736135F for ; Mon, 13 Sep 2021 13:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241382AbhIMNZn (ORCPT ); Mon, 13 Sep 2021 09:25:43 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34146 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241170AbhIMNX2 (ORCPT ); Mon, 13 Sep 2021 09:23:28 -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 A589740278 for ; Mon, 13 Sep 2021 13:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539248; bh=hZ5N4zB6ne7AqKTWsazgl2eww5+7SrfSBiF0jiwRIRU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V1WQ8oEoicl90mvQNd5qeVdtYBcGUzTnTBdbkiexfaoQVW3anJPjherjStF0XGr0n XcnthW4fF+R5Z1Qfwov06Dg0CC/Vz4UCYpzlijha2Edn0zHU/JPvG/QU1Zb/q9pqnX qRz0PfdjRJxcAgp4R4w7Nz+BH/AUiO7T7h3N7R4xEPccqgozuJG0thaGJ2fX1jg4Hz p28zpnUJldrV+m4q4FvWan2YvAyvEEHkInelVt8xYyLC3z2Dix1bdrd/JfSlEhe7Qv bpX/m0i7vaAyZMSnf7u3f3GBwEx/lZsANcfWoxbhLgGlDLM/wcasF0zYN+87b67gpp oJGhQlKs9CDZQ== Received: by mail-wm1-f72.google.com with SMTP id j21-20020a05600c1c1500b00300f1679e4dso3599353wms.4 for ; Mon, 13 Sep 2021 06:20:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hZ5N4zB6ne7AqKTWsazgl2eww5+7SrfSBiF0jiwRIRU=; b=uIt3wlRCunpiQRlZJiwicAPxj636oFIo5G9c0gMkdpK/vxyBHalAYSxa/yGG0aXQxO uhJH8C+aF4Ln3mG1te2NZIKZNyWWcVL6eS+n1tZZELSxGFHPJJ7Ejs3pdwzTyPYbvnYy 1+IRMBHcRd6EAVctOCj1aK4iXE9DwquLJAY70HksBBvIIzJJwQFAUHf/A8Zu5WRIDjR9 bSIiQLJeET5TZsjOvdzgu7mKjyHe7mldIYxIAmoxZjUqX1uzNmNMTTmRS4iUZOukG0hm Gk3/NCkF39lu9Mj29lUhyie4J3Q+dMLs0TPGRvSRYjyie21JPukEuvER/8xs5EWvOHRV yd+A== X-Gm-Message-State: AOAM533Fk0opcNQjPTX/wLTYeDXQyrbsafGG/wQiSfLiIk7llX/JozUI QkAltj+/+I74N250+QIFSn6K9SyXxM/d1ff6nioGf0gXSKyQJTANXk42uiodDbTfxuZPO64OpBy imko30xbmyWE0iD3JImC4wcrs5xd3qpzLxg== X-Received: by 2002:a7b:cbd4:: with SMTP id n20mr11406231wmi.136.1631539248162; Mon, 13 Sep 2021 06:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGW1ojaPyD1M/BS656w+4FJLzZXRQcOiJW5oHFj8BydpZT1RYPdlEY9jeHIFid1HBy2UQTIw== X-Received: by 2002:a7b:cbd4:: with SMTP id n20mr11406199wmi.136.1631539247756; Mon, 13 Sep 2021 06:20:47 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:47 -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 v2 04/15] nfc: fdp: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:24 +0200 Message-Id: <20210913132035.242870-5-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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/fdp/i2c.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index 051c43a2a52f..f78670bf41e0 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -335,7 +335,6 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) return r; } - dev_dbg(dev, "I2C driver loaded\n"); return 0; } From patchwork Mon Sep 13 13:20:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510286 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.7 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 6733CC4332F for ; Mon, 13 Sep 2021 13:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AEA761351 for ; Mon, 13 Sep 2021 13:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241761AbhIMNZp (ORCPT ); Mon, 13 Sep 2021 09:25:45 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34148 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241169AbhIMNX2 (ORCPT ); Mon, 13 Sep 2021 09:23:28 -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 470A34027D for ; Mon, 13 Sep 2021 13:20:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539250; bh=Fky4BN6I50Xw0PgUAedFiL1xcmFxZZIBVgJL+3QtpWs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LDLkqs8XWdJPlHwSTXyxBqQgS9MUADcFkE2jeuQ1h1KLFFQr12xXbs0/xRC364wcl sPciEhQIlfWS5UBUJ7ZaX0nxjDSekxJpqo03sLPA34Z9h5iqSShgjabo/B1nr7tAf2 9tMo6cIGW4/p+dywCEinGyvGkCgpmbLYQDgHPyNOxOHNdKcHc2+6i19KA8Vbv8vo1C +H5SPzBhLdqVmvoa8OeThfp23B2pNz9oBEsZDxamVfUmeod6v0rakq0ugxbr69xQPh mB43Yedahb3jr57kc96lcNW2j9sLMFGpfBPmOsbBg1nnrEIjdvgI5cGDRWjN8sL9Ev N7Yq8xekTvcng== Received: by mail-wr1-f69.google.com with SMTP id r5-20020adfb1c5000000b0015cddb7216fso2581932wra.3 for ; Mon, 13 Sep 2021 06:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fky4BN6I50Xw0PgUAedFiL1xcmFxZZIBVgJL+3QtpWs=; b=wgrr1+PeRFKR7onuJs8Z4SnUr2eKt4zR/a4eA2OaznBQ4l4V9PCxPca3KWmqiFCjKW BKL6dkUrzi/aNrjXsSL3fRkjiXQrg66g4NREkiHw0PXkrnC7dhNtLBe0lEcTtSWDyL1Q MIjE+8be1UuGp9o6TjFs4XOHpB6bSUIKhaVkSF26vy6h4K135E+VMF0W67kh8IrHUSVV 4Nbcc6nuTbWw6PxnBk2qSV2ZNBR/vhsKSFo33jp1B257CLbjKlC97bHqJFN1WmdELtNd 9q/OSnzOL80IMl6PkRe1B5PQA3l4FJLSoFzKk+VsRFkA/wIGJf1a7+0U+FQI9YwVlAD5 lA5A== X-Gm-Message-State: AOAM531ZGYpL+a22+mBjgQpWCq73fCiPVBGxsm+iqOcgCiJG2MidIisA /MUKl18k4rhlH+paw+DkFSbDdowm8a6MqtEPeQSn7V3DC7H2+CvWZ2DDo6e9s12IzhRE4hHVo/X LXybUVFwLppighooM+9CN2PjULC9JdDMI3g== X-Received: by 2002:adf:8064:: with SMTP id 91mr12357527wrk.252.1631539249990; Mon, 13 Sep 2021 06:20:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5+h/fKlKQdXDMhGSM5nR9XBZObuvBHmrufg69rir3eN+eLiOg4WceN/MxX2SmmovwgHEcrQ== X-Received: by 2002:adf:8064:: with SMTP id 91mr12357504wrk.252.1631539249872; Mon, 13 Sep 2021 06:20:49 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:49 -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 v2 05/15] nfc: pn533: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:25 +0200 Message-Id: <20210913132035.242870-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 | 4 ---- drivers/nfc/pn533/pn533.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index e6bf8cfe3aa7..f5610b6b9894 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -128,7 +128,6 @@ static int pn533_i2c_read(struct pn533_i2c_phy *phy, struct sk_buff **skb) static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data) { struct pn533_i2c_phy *phy = data; - struct i2c_client *client; struct sk_buff *skb = NULL; int r; @@ -137,9 +136,6 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data) return IRQ_NONE; } - 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 Mon Sep 13 13:20:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511613 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.7 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 E8395C4332F for ; Mon, 13 Sep 2021 13:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D13C1610CF for ; Mon, 13 Sep 2021 13:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241222AbhIMNZl (ORCPT ); Mon, 13 Sep 2021 09:25:41 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34170 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239614AbhIMNXi (ORCPT ); Mon, 13 Sep 2021 09:23:38 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.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-0.canonical.com (Postfix) with ESMTPS id 1456840279 for ; Mon, 13 Sep 2021 13:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539252; bh=YdMV9AtCFFKriT3c6sHpvFf+xJsEOIFlGHmRsaTySis=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HOAAKwvdpdmyH4tdpGVLfBqD7m7LYolgeZaXaejKnCYlIkAt+0WOppnAKz2z1uvmy lRxcsgqJWAwqztZgs00xu+3VwdmR9CGLiuhoKii77BVNDeUHux8Meo/97gXwRRJPEM PwgTSn2e9HlmD9jc03v9jgYNaB9RaT78pBDzO2uqEodYlGCIBj0zWUVLHhJl58x3Qe MsMZwM5ixJ0ZBKcn92c9ite40yrYPNabkOeaOqkx1eM/WTvsjHnLQXxPjA7ggLekS0 MaA5GKbH0bFRmdgzhJ9EMJBf4BIGTPTUIP/kzuz7ZdA55D2tYE6xcoqiqEmzzdm+NX Pw18Y5UF936AA== Received: by mail-wr1-f70.google.com with SMTP id z2-20020a5d4c82000000b0015b140e0562so2675132wrs.7 for ; Mon, 13 Sep 2021 06:20:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YdMV9AtCFFKriT3c6sHpvFf+xJsEOIFlGHmRsaTySis=; b=FGWRmn3x6KFQczUEXSnas3KLBgbNVYxdlNWBayJEq0lFykoYdWXvDL5jUobwzxWGfh TpQ522uTgblKw9vHe1Wtnb53i97fTADqpiUqW0S6nD0A3556XnlzV8IbLR/6UeOvcAWl +bd2FV74YZw+LhuCSTb9xq/951NChItJGOs0rMhHGFNc38a/NOhFtbjl+yrJSOxb6fwl a7xYLO68xASqrquatL6qSBn7ZSceEeM6CEZt4SKfd+md+H1PNPr400/p/hX4fZkbCRDg CwJkgNqefHYFKWK0fLu5ptX0fDt/QhI8NK586DhyPqIfg9CmmlESNWf/wyZ82l23x8Hz y/1Q== X-Gm-Message-State: AOAM531YFamjCUgACRqo4n7kzQ4C9n7QtdtBBKJes+673wL0muaERgf3 Oprf7qYkfd5AlDBTBSAlllGKaICS5cdbOrlRtLiZpiOc1mBrrx/gJG9BjTy0CzHGVuRQduwGhlh KI+T2hLn5pX23tRAqfte9DdmI6Wq6SfIMLA== X-Received: by 2002:a1c:a911:: with SMTP id s17mr11244119wme.84.1631539251775; Mon, 13 Sep 2021 06:20:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDKCa2J0aDKEwfGljc8lrJwSBXahWxEFgvrIqIssT5ml8sBzDELvL1CsHBBwjLD7+R1dAL1A== X-Received: by 2002:a1c:a911:: with SMTP id s17mr11244098wme.84.1631539251649; Mon, 13 Sep 2021 06:20:51 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:51 -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 v2 06/15] nfc: pn533: use dev_err() instead of pr_err() Date: Mon, 13 Sep 2021 15:20:26 +0200 Message-Id: <20210913132035.242870-7-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Print error message with reference to a device. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn533/pn533.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index c5f127fe2d45..da180335422c 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2171,7 +2171,7 @@ void pn533_recv_frame(struct pn533 *dev, struct sk_buff *skb, int status) } if (skb == NULL) { - pr_err("NULL Frame -> link is dead\n"); + dev_err(dev->dev, "NULL Frame -> link is dead\n"); goto sched_wq; } From patchwork Mon Sep 13 13:20:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511614 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.7 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 1CFB6C433EF for ; Mon, 13 Sep 2021 13:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0AFA2610CE for ; Mon, 13 Sep 2021 13:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241794AbhIMNZu (ORCPT ); Mon, 13 Sep 2021 09:25:50 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34174 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240928AbhIMNXi (ORCPT ); Mon, 13 Sep 2021 09:23:38 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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 5B40B4025C for ; Mon, 13 Sep 2021 13:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539254; bh=NBr1U4LAwKajfkWi8d66f/F7DJmWNcP01ndf/w7qpqs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eKne7l7JsWA9Oyqv1ej25m2CyAPojw00ksawllNBhUEzH0ZbiNYz83s/f9tfqky5F nIdM5nruK+ENQJgamMXhOKzqvqbmCXZ0H7gNdv623agZNW7W2TuB96pz0byZuS9kyg 1gIsNpbQ/fU/u2CvHGQ7E4mmq4mZF83AJeCB6w2dhSVcMdPe8ZpB4/rbC/mVA9BAH3 jRY1ekDZCtXtrgeMFeSLZzbPulME9H2eq2URilg78BcpkGrFBSPkCj3QHpTJIw+OJb fpCvjHdVDEuROrY95Re+jRus9/7YOom1q421gYqjLlWq7zNYRyfRgH8AR48iUwxE9P KRmlgh5GimozA== Received: by mail-wm1-f69.google.com with SMTP id z18-20020a1c7e120000b02902e69f6fa2e0so4910703wmc.9 for ; Mon, 13 Sep 2021 06:20:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NBr1U4LAwKajfkWi8d66f/F7DJmWNcP01ndf/w7qpqs=; b=ujzcYt8u+UezoTANtm2+pFsHMIZ4ZDEHLTz9HowdqI727RxLBsdqWoMl0yRPIpraIb nNMloi6cvON8gBXJDM68lvye8vDBWSn2fuj2PSWcjuo1K+ssD2EF1056DdDS+KZtYttS r0UnanaVbeoLlHUcezGZ+LMBztkMlk1dpKNy6pthohIg9gH2peRpU84UUwVnEJQqYgT/ nuFnYbyrGY0R+iYCSMG3fGwik1dNWJobTpXLgnHz6FEcuk0ehBgJsAx6Zev92vcrj+Z/ AvXuy69gm5wSEZZgsqJYvxj5wuh2z0uvpQs5BnUvj5y8zNG1o1Roe0rvs9PhPUPGRRMP Ehyw== X-Gm-Message-State: AOAM531b1kIk//zAS5yqdFKJQqTIvufCVXntRJK0L2eiThEwTI2DqdhV bbJhYqQpmwwq638kKW9YvxY1voWIZPj1J02n6lb9Ef071PxDfrmXVF8K4Xvr++qKcrP5Ew1ZhDp uKtasuWXPbqIp45SuRAMYn2O7kwoS9s55CA== X-Received: by 2002:a1c:f60c:: with SMTP id w12mr11300816wmc.3.1631539253788; Mon, 13 Sep 2021 06:20:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4mhlijtrqBRrwe325QIJTV+NH9oRbw4vOfFD3MMxQ/lm7QV3e8395RpL+PFPpNFF13sZ40A== X-Received: by 2002:a1c:f60c:: with SMTP id w12mr11300790wmc.3.1631539253600; Mon, 13 Sep 2021 06:20:53 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:53 -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 v2 07/15] nfc: pn544: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:27 +0200 Message-Id: <20210913132035.242870-8-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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/pn544/mei.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c index 5c10aac085a4..a519fa0a53e2 100644 --- a/drivers/nfc/pn544/mei.c +++ b/drivers/nfc/pn544/mei.c @@ -22,8 +22,6 @@ static int pn544_mei_probe(struct mei_cl_device *cldev, struct nfc_mei_phy *phy; int r; - pr_info("Probing NFC pn544\n"); - phy = nfc_mei_phy_alloc(cldev); if (!phy) { pr_err("Cannot allocate memory for pn544 mei phy.\n"); @@ -46,8 +44,6 @@ static void pn544_mei_remove(struct mei_cl_device *cldev) { struct nfc_mei_phy *phy = mei_cldev_get_drvdata(cldev); - pr_info("Removing pn544\n"); - pn544_hci_remove(phy->hdev); nfc_mei_phy_free(phy); From patchwork Mon Sep 13 13:20:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511612 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.7 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 831FBC4332F for ; Mon, 13 Sep 2021 13:26:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5DD94613A7 for ; Mon, 13 Sep 2021 13:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241599AbhIMN1d (ORCPT ); Mon, 13 Sep 2021 09:27:33 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34138 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241731AbhIMNZ1 (ORCPT ); Mon, 13 Sep 2021 09:25:27 -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 4985B4027B for ; Mon, 13 Sep 2021 13:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539256; bh=alAZCnXDBZFqFGCWdjT1NtYwVcFPW4mHC6+AQVNQmag=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G9djHexx0R9NXdFbT6r2ji1LWT3IAbRkzWQgazK6/VEwNWmqrZNvuUhnXu0fh2Hu4 najF96bqY1mZwlFxe0OmAWSj9P1sq9eUw3i82zFLm0mylPlPYsSjC66mzzxhUJvQkJ 1ODm+0Qsm7teBvMnWF+YOdFSfvVoVcXdY8Gx2J46MrwDAMv1oDR0RczB/RHPcWGWMf qYHwDwak48slGNo0zWx6Z8YiQJRvlLcfjRiAWl97/AdO4SOQl0pUZeVF7EjQ/Ds6AW azPU35IMMUw4bgXO8xPk5fLLyCgSBLggKHMgyQsaZw7fI9gi2ULOV7SUlvdhnDf0hl RDVlwL6khJpnA== Received: by mail-wr1-f69.google.com with SMTP id v1-20020adfc401000000b0015e11f71e65so213653wrf.2 for ; Mon, 13 Sep 2021 06:20:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=alAZCnXDBZFqFGCWdjT1NtYwVcFPW4mHC6+AQVNQmag=; b=pIR5Qh86MxkBwVxs6oWP2vm9ovsiKkE43Bl1iL6QgJia1BzeRXmg89B4Uef8OZdeuP qunZiikxkACGf/oAFy7rO9Ja38YlVef/OIbtVKInkJlYFTu5HVUn/2SDZKqBgFxWXSkb iWeaggzW/Ly1e8CYDiO6oW2NctIB4YwLLg7nKpyel4azS4mamzyh1pUiSVampZfU5bZU CMGDPHu/owbN8PFGqpGGWUrXCu+8Jjv/XMIOIUKQx7wKWhM+c+Xw2H3k9JUT0CvtXUc7 ov4Z8s01gOmwqQqgT0ROP0jGHJfh2e5DDs03h5ZTuveCxyQ/7wunDNvk3i5QV1eeF71r ESVw== X-Gm-Message-State: AOAM533XJvxwcIbwesZRQ40G2zvBBKZQXOLAjTiMT7fl7j6JOg9hRrab ekBX5uVYZH16I8f0auxt+V8IB7hnYKfzIljaeQHYiQUNAygploLKwD+w/zIYDt3Le5Nj4QSVBrH D106Rcruo+ZYWWlMUs2f5kb3uZITUcUkG1w== X-Received: by 2002:a5d:6792:: with SMTP id v18mr12576739wru.416.1631539255420; Mon, 13 Sep 2021 06:20:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwY6LXmCoBiMxgVg0ZBqajR5G6WaCpegfR/vq0xViC/Z1KjH8g67spH4c6MeVe7uNeK0A2zmQ== X-Received: by 2002:a5d:6792:: with SMTP id v18mr12576720wru.416.1631539255299; Mon, 13 Sep 2021 06:20:55 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:54 -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 v2 08/15] nfc: pn544: drop unneeded memory allocation fail messages Date: Mon, 13 Sep 2021 15:20:28 +0200 Message-Id: <20210913132035.242870-9-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510282 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.7 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 AC466C433F5 for ; Mon, 13 Sep 2021 13:31:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D24261502 for ; Mon, 13 Sep 2021 13:31:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242850AbhIMNau (ORCPT ); Mon, 13 Sep 2021 09:30:50 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:57998 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240870AbhIMNXn (ORCPT ); Mon, 13 Sep 2021 09:23:43 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id 7232040268 for ; Mon, 13 Sep 2021 13:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539257; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AT50zYsUhKhBvVWly4zWGiIrS3fw5Rlh4zpx1GMqIPavvdh+ETuapUj/qL5a6nNhe FFves17C7x8wL5TO4f5sJxY5fz22AUeugk1jpNdYikqh0iiiB33rCfZv7qkv0CKCNy hXHv0K4rxaEbfyKabgsaPTMBmz4qAyENB0cH4C+Mj4UWk2e51MceKb3EPIxlvN0vXV BO1bcxQ/GkA8znmTwaiV+p+eOUBOj1voQPG/sfYEvYl9UYqT39KCIkQbi2G2PqlPTc M30cOF+uNshQzbCDy5h55KvHSjy3fm4rRjH72Tu9rRlBiraSedDWrCUz6HwqKBT+tT v2dtDH92X5tNA== Received: by mail-wm1-f69.google.com with SMTP id v2-20020a7bcb420000b02902e6b108fcf1so3954194wmj.8 for ; Mon, 13 Sep 2021 06:20:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; b=woTtIbdAbccPM1tGXx6siuUzwZ/yiePYaH5l65JL0RSgNkshi8aMARK5pTBMjmQptC afVu9HnyyQPiVdB9XrSwREPCBD7wcZmnpRyPjovkwU3s+TWicNAk7S30LhUTuewViH0h LQyjRk1Dmv3p6FOGYQz08DmSixY5qzr8q4sM36CvnsoqDNOCdmyAnW6yz+7kk9xjMk1V wZnKhEA+g1dsBIuErGinm86aJgb0ftL6pzkiKutMJu2csceWWwUVl4uXTR8taR3KmdU2 XCFNs9No1ETsZoERFNflXX8mVDk3Wb05PqY8VL8KzmbyXkAbW2CjJy94rs8QNnu2V/8Y YJkA== X-Gm-Message-State: AOAM532JYJ4gJ68y7OXKQM5k/m/Y4fd/bfkvtYWCg/547ofENWtcQdt0 ZgRIAXr5ZsK4XQZR/Y60iAJ30OznHVJ00Dsexnj49HgAfv3nALrLUNSTRkskAjVKadDdbmeQReR 4VZPPd0EFcY/lrFFeXCAAJ+IfzFFPS1eGPg== X-Received: by 2002:a5d:444a:: with SMTP id x10mr7654691wrr.360.1631539257017; Mon, 13 Sep 2021 06:20:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKPj+462pRRxILGM9tOXiOgGchmte7nE+V57dc1dDDx9G598lnjvVj+fXxoKdQ7XG2OOEDQg== X-Received: by 2002:a5d:444a:: with SMTP id x10mr7654671wrr.360.1631539256797; Mon, 13 Sep 2021 06:20:56 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:56 -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 v2 09/15] nfc: s3fwrn5: simplify dereferencing pointer to struct device Date: Mon, 13 Sep 2021 15:20:29 +0200 Message-Id: <20210913132035.242870-10-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510284 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.7 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 86ABEC43217 for ; Mon, 13 Sep 2021 13:29:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7470361407 for ; Mon, 13 Sep 2021 13:29:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241120AbhIMNax (ORCPT ); Mon, 13 Sep 2021 09:30:53 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:58000 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241255AbhIMNXn (ORCPT ); Mon, 13 Sep 2021 09:23:43 -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-1.canonical.com (Postfix) with ESMTPS id 2006D4025A for ; Mon, 13 Sep 2021 13:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539261; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TMNZbVo/ucn+tm2cE6ewKpKu1dOdxN+bJ4vpN2WG9IG4Z13hspFtogObidA4p/1KA V8EuHGqNih+eIh6uZcR8mxLfGazJcT7QuTj79uuJtlIPffmRtmX1iJEOOLk9moueji wR+vmwd82wLrHb7556CMHWFH1vEGVtZ2++5UZE+z2TWO1+eCYhM5VWldsPXarY4s3v +cslvJKrfd1Y89sXqsSOFWtsm6RQAziqPvkEyWYffwWCqOO46V6ZVibhB3Qy0Wp2jJ lvHuIcWi+vvS9e3v/2d7k/lzJtoZp769B9bjXvMxk1JJm5zelMMFu+7QRtEET1Yy/E YxIa3AmY81z3g== Received: by mail-wr1-f69.google.com with SMTP id x7-20020a5d6507000000b0015dada209b1so1721388wru.15 for ; Mon, 13 Sep 2021 06:21:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; b=EgXDlnJc8+kxRiEk50upjIYpUsEeWLWgcHZotgPVUMdAzr5284sF60bWkllYfq/Ew+ 14t/wNXGUwLiDik3ZaxjmMIF/N2a2lYdYZMr7198OTE1PweGDn6UWIWQ6eHasiNpQed/ 3dFdJ8AHYvsvw/eTHEMkPkBqBcEOVl7ZBJ4Tx7ogGipZwr2qXDHxAy4RVUSFgP+Dbij+ uQdLyMEyusAC6BHGW6BOgYVT1UyC5d3Bru65clbxk+cdT4UMPG/4fkEuLFqWpcqCJiAB apx+usHGsRe//SNaqC8Pp50YRIrqzEaCgVLsXhdZFE0vtpdw3IvpGrXtSBS7iKm/hAnV cgUg== X-Gm-Message-State: AOAM531+WfDycTkEzqtxfFoUuDhawEx8tqur9mn2z+6w9QbapJcxwXwk z8obgpViu3OfDzN/wyGEc+/3yk5iASN6WIAp5xGpr8bqTv5hnevbThmhA1lyjJ8fZzsSHwQXbM4 a3xVkNbqyll7n1MnbKWAPchYQPLsbOiaClQ== X-Received: by 2002:a5d:4388:: with SMTP id i8mr6660941wrq.340.1631539260783; Mon, 13 Sep 2021 06:21:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9b4kSBhCL6DUt+xU/J4y6fvbkwU0tPTRSWx11ig4nLHeusihi+/2ld4uYaI4hNRQ5P+6GUw== X-Received: by 2002:a5d:4388:: with SMTP id i8mr6660910wrq.340.1631539260586; Mon, 13 Sep 2021 06:21:00 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:20:57 -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 v2 10/15] nfc: st-nci: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:30 +0200 Message-Id: <20210913132035.242870-11-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510283 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.7 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 2CE7BC433EF for ; Mon, 13 Sep 2021 13:29:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15D1561354 for ; Mon, 13 Sep 2021 13:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242436AbhIMNa7 (ORCPT ); Mon, 13 Sep 2021 09:30:59 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:58004 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241260AbhIMNXn (ORCPT ); Mon, 13 Sep 2021 09:23:43 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id 8B16C4026E for ; Mon, 13 Sep 2021 13:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539262; bh=Puh8mRYPY/DpKQ/I9uyYNXcSBWp/u+3lkb87itcd3n8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uLvp7vZqM1PzcVV1bWXHT0vsi4fjOP7t/AwL+w+L5kpIfHIkG9q9kt3rcDRjPcN0w oG2c6lj5RkLdCg3walId7JQHq1Skpa17JA6+pk6Nmvo8TAY6neYCcv0HUKL429toMy WZyQUj6MqN2XpQNQF5jq5L8BBQEH07nOFFk4WRCrDPmVyM05sLWHd33/SBjk7Na28+ Ojo9N3rKktZLrm9Dq2THtdAtxT6Ig9SDPaAQw3H2OHbE2kAznmYUsPYzM9O7kD3MfQ wZPiUvBf9pikq1wjqGUpOb6XUNoDyHdi3TZeeQLpF4POto5BmqpjnRNQuOkn+DsSpe 4e+vwAfsk8PJg== Received: by mail-wm1-f69.google.com with SMTP id k29-20020a05600c1c9d00b00304e40495b2so2250257wms.9 for ; Mon, 13 Sep 2021 06:21:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Puh8mRYPY/DpKQ/I9uyYNXcSBWp/u+3lkb87itcd3n8=; b=cdJnHrk7vWh3FFDqnNshC9NpRdG3Y8S3U6jKcRYUNtdlPuWMXiSUFlbPYImh2wA3PK GhxAkde8PfuMPySCFVj12B9cH/tzeGBq6nMQLk0l4n1uhUm1qmXSyTnLiQN+LTBVa94+ sK9xKgPqQartFDhJ1a6F/GP+rpKPWh7DnzkacVLN+2GIaXmNACikUNGMGr3ZD7xZKg1k 8rlS5ZZ5YWQetRrZlYXYM5HkQBB6CcaHofErfNXBT0GTc7hgFVErcOKm2evjVoUBf9tN JytWMYJjtCwACO3ZTwVHxCuk5LgTfZW12wZ16+TLoF+CW6Af2id6JgjsCagmcb0pShRc Evfw== X-Gm-Message-State: AOAM532CvY0fam77vx0a5jxPYLJPfh6F4c6GFv1oGLXe3HtEQpL+Z+ZD HYJ0Ti4pJRjBvjFwlwenSzsaVf/4jM00cHW1adwRV2emPBvtGJpqlnZfAIXjVoXt67gUFyt98VY 1DIgXNs09tKUz1KDyYBk/MhCErgx5PHAijg== X-Received: by 2002:adf:e603:: with SMTP id p3mr12101604wrm.357.1631539262218; Mon, 13 Sep 2021 06:21:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygqJruRSYR9Q9zBFsSsLJSWGwT+Q/2eIRUa8zP6I8mSGmE1siN2j4h18qxV+UlfZLC8c6o7Q== X-Received: by 2002:adf:e603:: with SMTP id p3mr12101586wrm.357.1631539262084; Mon, 13 Sep 2021 06:21:02 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:21:01 -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 v2 11/15] nfc: st21nfca: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:31 +0200 Message-Id: <20210913132035.242870-12-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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/st21nfca/i2c.c | 4 ---- drivers/nfc/st21nfca/se.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 279d88128b2e..f126ce96a7df 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -421,7 +421,6 @@ static int st21nfca_hci_i2c_read(struct st21nfca_i2c_phy *phy, static irqreturn_t st21nfca_hci_irq_thread_fn(int irq, void *phy_id) { struct st21nfca_i2c_phy *phy = phy_id; - struct i2c_client *client; int r; @@ -430,9 +429,6 @@ static irqreturn_t st21nfca_hci_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - client = phy->i2c_dev; - dev_dbg(&client->dev, "IRQ\n"); - if (phy->hard_fault != 0) return IRQ_HANDLED; diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index c8bdf078d111..a43fc4117fa5 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -257,8 +257,6 @@ static void st21nfca_se_wt_timeout(struct timer_list *t) struct st21nfca_hci_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) { @@ -278,8 +276,6 @@ static void st21nfca_se_activation_timeout(struct timer_list *t) struct st21nfca_hci_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); From patchwork Mon Sep 13 13:20:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511609 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=-15.9 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, UNWANTED_LANGUAGE_BODY, 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 6C396C4332F for ; Mon, 13 Sep 2021 13:29:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 586BB61356 for ; Mon, 13 Sep 2021 13:29:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241046AbhIMNbF (ORCPT ); Mon, 13 Sep 2021 09:31:05 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34282 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241744AbhIMNZ3 (ORCPT ); Mon, 13 Sep 2021 09:25:29 -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-0.canonical.com (Postfix) with ESMTPS id 1AEFF40280 for ; Mon, 13 Sep 2021 13:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539264; bh=vC5ZeeYLEo1QgnDozyJaTYMB8bYZWzk5ZY30xgpVgcM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NxX+W5q53mrv7BPf8fvhZP5qOOJVjz3Wz9gK16ncuOso7L44VDHCJf0DySMSRR2Xe wAJKoHZCyNFwJdQqRegd6j9Yp0p1FsCOrqmUHuEvcsc2V/O0KNmKnP9gPMTpYqpraS LIhpMMCdxh9xsPZ6QoFfKQLcnFAYuI+svYJBZ0QImfsl3kJxufz7F3Nt5aVywavsYc uVytcCuV9dHurAy1TmeW9nN9tNqcKfoY811qfz803MdSt1rA+dTrEsgYnMYoFxl+Qa 8m1KMYG4QP79+VlSLqn/M5f38evu+Ss2gogjQ4h06HTWmMGvUtdNohmXdeMJqmyjjd VdNrJda/oL6IQ== Received: by mail-wr1-f72.google.com with SMTP id i4-20020a5d5224000000b0015b14db14deso2645870wra.23 for ; Mon, 13 Sep 2021 06:21:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vC5ZeeYLEo1QgnDozyJaTYMB8bYZWzk5ZY30xgpVgcM=; b=x95Yq7WOUsRxylkQpxrbHpHzMN7/DtmPzRdqu0t6TRRZSYJ2fzoUCxLZItnGkIURU4 OScFCcgL52N/M1MzZDgInEqto46SJOiot1gs6E+CvrdrESABWzrgN8L95sInXwFhgF9L HjE1bpf+XSMcZ1x3Rb1LBGJQGEOQxk0edpT9GdxoxWMzTGlpRPZ6NfxtXIOIZnZmHFoU +KzgeHleY9QOxF55xSEFAHAjz1SL3avpgvLrcTK2IFQKXAhwgM+xi60MW8PwIvazV4gC BG8uDf7GRfsraSxj2ofrvraElVKvcEwavAAhdvayY70VuTdqeq8NuzbacsJP3pKCq4GP F1SQ== X-Gm-Message-State: AOAM530eYVatcgKaSz/KcEnL4Ie5g9gK2/OO38BoGt/e8COYKXGnPNgv SIv51rvKHLmSkGHVMMefoH87ntFVrUhkdDqr2Toi+i7GAgd7aVPdcOEhKX0yD2wv9v+jFr9AEPa jM6vig2GQrKmGVd3Sv2xSL8g/B19h/1E9WQ== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr11405613wmj.144.1631539263848; Mon, 13 Sep 2021 06:21:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/izsu1khftAkG5C5T0/hXLkw7auLof1x9kSlmEPTvEP1I+LgccfCmnvu7rQjvYP7wlALVsg== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr11405588wmj.144.1631539263665; Mon, 13 Sep 2021 06:21:03 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:21:03 -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 v2 12/15] nfc: trf7970a: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:32 +0200 Message-Id: <20210913132035.242870-13-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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/trf7970a.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 8890fcd59c39..29ca9c328df2 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2170,8 +2170,6 @@ static int trf7970a_suspend(struct device *dev) struct spi_device *spi = to_spi_device(dev); struct trf7970a *trf = spi_get_drvdata(spi); - dev_dbg(dev, "Suspend\n"); - mutex_lock(&trf->lock); trf7970a_shutdown(trf); @@ -2187,8 +2185,6 @@ static int trf7970a_resume(struct device *dev) struct trf7970a *trf = spi_get_drvdata(spi); int ret; - dev_dbg(dev, "Resume\n"); - mutex_lock(&trf->lock); ret = trf7970a_startup(trf); @@ -2206,8 +2202,6 @@ static int trf7970a_pm_runtime_suspend(struct device *dev) struct trf7970a *trf = spi_get_drvdata(spi); int ret; - dev_dbg(dev, "Runtime suspend\n"); - mutex_lock(&trf->lock); ret = trf7970a_power_down(trf); @@ -2223,8 +2217,6 @@ static int trf7970a_pm_runtime_resume(struct device *dev) struct trf7970a *trf = spi_get_drvdata(spi); int ret; - dev_dbg(dev, "Runtime resume\n"); - ret = trf7970a_power_up(trf); if (!ret) pm_runtime_mark_last_busy(dev); From patchwork Mon Sep 13 13:20:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511610 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.7 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 AAB83C433FE for ; Mon, 13 Sep 2021 13:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92B4F61354 for ; Mon, 13 Sep 2021 13:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241366AbhIMNa4 (ORCPT ); Mon, 13 Sep 2021 09:30:56 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:58006 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241265AbhIMNXn (ORCPT ); Mon, 13 Sep 2021 09:23:43 -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-1.canonical.com (Postfix) with ESMTPS id 51AD04025B for ; Mon, 13 Sep 2021 13:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539266; bh=AKOLSiNotprej29rkzU07CereuPK7jDMwjY+iTyzzwA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=miQX3ZyO2Si5M88Eae3XDTF1Zuq3JQtQFn4dHRPuWtVZ0a3shezfpZsaqxMC60Y42 OC0Q+6gM7+qpFhUyVTuz02UC5OyAXCjXrxtEaPLFJMrjstWWHvIpaMfqIXGdMmzhYO TdSlPqRyGtITbYiXZc9ACAV/N7brxABfE5qdcBiTYODuF0yvLnYGzXHohiSPtxBTDn PKSMfpjg7g/AZTvEznopOGUCMIIz4XmrIDQxScqnWVlMAw8nns+oo2YWXxLYR7xHyR jkle5qe0LoxjoZzcxNlGMHaS43rvNdT+GLwKgVXkMjVjD62MGYJAvzvZtsf0gu15q4 oL8tprYBu+gdg== Received: by mail-wr1-f71.google.com with SMTP id r17-20020adfda510000b02901526f76d738so2690716wrl.0 for ; Mon, 13 Sep 2021 06:21:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AKOLSiNotprej29rkzU07CereuPK7jDMwjY+iTyzzwA=; b=7JAXdW6odgdoBeu+9MDo6DFWxUmgaVQ3dQvZf3dxzQsLoNIaD1eYWmy8n9DDtIQjRU rbgCwc+TJJpvyx6/QX3V8JyHx9mmmh3wAQvkZOvsYC3GOiduMxfDQMQnjahe4oNKh74d zSenR1D6EosfT9qgQgOWvgwEGCScYOdDSLIb12Y2VKt8v9r6NqXo8bEfZSrDp2AAsQUT XQ4jcjzjssG+wP7vcDqlKli7bBNTkquFkjSaaX8AC+XOgIOKEgD9zX4IKim30KNjKdgZ DBj7HI/kZN0yWTNihXreWVQUuiwxWyw/8y++a4FJZYLVcm92qXllgpH4gmRHJ5vdRZ21 mFqg== X-Gm-Message-State: AOAM53130LuYMI3Md7rTLj38GOo8lcwJCxFQjT5ZvuORpwxBltNmi23f ZRCvvtrDOtsun3mK1XdA+MFqWndlIxpnNR4u7esBXJY1X7GGW4wi15omFne8Nlx5zx1rzr9efpB Pu6VOjif//HcK2g8u6blfYV5IPc6OlpQP6g== X-Received: by 2002:a05:600c:896:: with SMTP id l22mr11120622wmp.173.1631539265713; Mon, 13 Sep 2021 06:21:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGKB8zsRCueVcnv/F/wvUaRLWvDTsfD6029ziTjUpm5OT7cpm9fnOgAqV38PdDEO3snD2i1w== X-Received: by 2002:a05:600c:896:: with SMTP id l22mr11120577wmp.173.1631539265398; Mon, 13 Sep 2021 06:21:05 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:21:04 -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 v2 13/15] nfc: microread: drop unneeded debug prints Date: Mon, 13 Sep 2021 15:20:33 +0200 Message-Id: <20210913132035.242870-14-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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 Mon Sep 13 13:20:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 510285 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.7 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 52B6EC433FE for ; Mon, 13 Sep 2021 13:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FF8061221 for ; Mon, 13 Sep 2021 13:26:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242226AbhIMN17 (ORCPT ); Mon, 13 Sep 2021 09:27:59 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34286 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240929AbhIMNZj (ORCPT ); Mon, 13 Sep 2021 09:25:39 -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 84A2C40287 for ; Mon, 13 Sep 2021 13:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539268; bh=KQ0ijwIeFsveeXdiNAQIdSvmUM7JWh6ALRqQaOVckDE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JHdhHlDpHlmfCOtBj4u//FCtXZVMIbqJ8nG62pu7fkbiYuIe+to5PFM4koDu2R5hf 5eAFOsEJ8DfgGwXWgF7fNVnn6+cEbJ528cLveqke1SukjiR9pSI2otxORjjbEvR6dK KXMiyZVTXWktZ2SuSDQk2/RI7wak+XxT7mmM3Y4JCwx0c0CVWNsLchlITPTyuhBkem cu2Lv0Hka5xyBx38WrP1RH5Sq5qWxkd10CD76aw0ZjeZH6O/5x27Kgh9Bk+R7BwhM5 w9FO48hcUS4Cjo7b6LbuD4ZH0fnAbwCa+NuuQFzwIsyqz32g8pn6/FM/NuUQLhgPGu IGoWV76ycLkJQ== Received: by mail-wr1-f69.google.com with SMTP id x7-20020a5d6507000000b0015dada209b1so1721489wru.15 for ; Mon, 13 Sep 2021 06:21:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KQ0ijwIeFsveeXdiNAQIdSvmUM7JWh6ALRqQaOVckDE=; b=P+bFflxyqqaYKXabFFnYCh6fjLdlZbnMpJ3mq85DvPv7/NFQkWUISH4LnTMy/fl2HG cl2JJpWHBUH2NJfE8NsH3Wdcpt2TdjasFYjjF4KAsJ7tYqqsBaS/+m3oVCJcN7ik2C5z pIZzbmHWr/vxMpJBOb2OXFUL1RdgR7W+AVoCY2RqLcl+DQA7IaIINn96klLxMNDQ59a5 CA1+PkJspU6yTBAULYO8ZTsrqOum7IoLfpEK/65QluiP+VVGUqumTzYg9jA4t1Rx1Kam Y2YnTeyRe06TzrIqmG6GOdFhKQw6h6nYx1ROz8rj12PR9M01AuJJMlVhu16oIS0oamv9 kvIQ== X-Gm-Message-State: AOAM533sQdBenUCoJ4zQPm/gMR+6faqdH7j7c6c23PzGdoMxehaWNwn9 717gTe1r/IFWOpqbPBT4S8jGdFRkOZIANu4zP3ydFh26znbLREs6ROIZFcQWivrtW5O0xD/t9XQ N03kIOoaLbUSvDbqeiCQQus+9WMqpRcpH4A== X-Received: by 2002:adf:b319:: with SMTP id j25mr8072579wrd.256.1631539268292; Mon, 13 Sep 2021 06:21:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXQGN4lsPt3X80FcvViXLzjEb2mk7vyuKiz1WyuQZmj2rN0DA8sZRymOZ4nkeEBwSNZW4Pfw== X-Received: by 2002:adf:b319:: with SMTP id j25mr8072562wrd.256.1631539268146; Mon, 13 Sep 2021 06:21:08 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:21:07 -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 v2 14/15] nfc: microread: drop unneeded memory allocation fail messages Date: Mon, 13 Sep 2021 15:20:34 +0200 Message-Id: <20210913132035.242870-15-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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/microread/mei.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 686be3381727..e2a77a5fc887 100644 --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c @@ -24,10 +24,8 @@ static int microread_mei_probe(struct mei_cl_device *cldev, int r; phy = nfc_mei_phy_alloc(cldev); - if (!phy) { - pr_err("Cannot allocate memory for microread mei phy.\n"); + if (!phy) return -ENOMEM; - } r = microread_probe(phy, &mei_phy_ops, LLC_NOP_NAME, MEI_NFC_HEADER_SIZE, 0, MEI_NFC_MAX_HCI_PAYLOAD, From patchwork Mon Sep 13 13:20:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 511611 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.7 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 A2195C433EF for ; Mon, 13 Sep 2021 13:26:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C8556124A for ; Mon, 13 Sep 2021 13:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242194AbhIMN1z (ORCPT ); Mon, 13 Sep 2021 09:27:55 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:34290 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241188AbhIMNZj (ORCPT ); Mon, 13 Sep 2021 09:25:39 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.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-0.canonical.com (Postfix) with ESMTPS id 5BF5E40289 for ; Mon, 13 Sep 2021 13:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631539270; bh=IGi454bY1uM8p5QRZSKGDo9YXvHCL/LufQFtzz+SznM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TVKJmnVJLRM5Hrah7bOUMODh5Vj2a4tf0Uy/kSSXkYAij64cluvAPFXi9l5UMOY/O OzZT4Wm0ftonrNR7Jor0StEYPT1X2eBJUxa4T/ErI7IlACiUqY1tNNsbcT/DDiRzG3 ygtg3Z3K94aM2EKy6GSEbL9mbC/qvY765Slj0Y2JFuAyfJNLJ3dA1YGtJ+HiulRJ6Q eGct19qat+WAYVzla/3csbW3Axocc7aKnQ0mSsHA3Fka/yfLHXGnKFNT1eA7OReb59 D1ez94Rqp+yp2GA7NVKe11Fcr+qXKANEg8ExV+puCigQCoHYA0VNqv14iJiWq66q9I WiFe9/ooT2jFg== Received: by mail-wr1-f70.google.com with SMTP id n1-20020a5d4c41000000b00159305d19baso2671630wrt.11 for ; Mon, 13 Sep 2021 06:21:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bXly3jhS3HjUQevRnsHew8JXT+x6aGpZz86Pmxfg8UUiLMftbcOMx+91rz3wsFEheZ mFoHeSy6waQkiBK5A1piMLP6jlYmFsSkAVeezHuHAL9RvXDJtu8nF75rZp991Nz68Jn3 9q1CTs1Z76nOiAJv1NbGmPLPZCivC7iUadWq4HR+EqLmwl91dx1sLBe/S1RbIDeYI+3x IsYXKpM5VGO91O8UQtSWGhJSsWz01N7wrl4hR5w+iKKXXUFvzti6Kc6Q2Dfwjm2FujWS rjpb5l6Q7d5w5AbjlT4zOCCNtBJuWfyBX43EcBpv2OyhGQmSu8TaXL8aoivJ6j0G+n3i arOA== X-Gm-Message-State: AOAM533uu9tnNB2A3b1OuKHX3ajpWnf7IJBeycFiNptK6O+raIZFxoyw bNctKO0khKNkSGXpGnuDMvPNVx6WczuALvndGI8bw0mjE55qYXmKlnJdui1O15JKQGOffCMA0zz KgQO7+mOxR9P8kI7DfPsTqmlY85HqOqoPsw== X-Received: by 2002:a7b:cc94:: with SMTP id p20mr10982108wma.75.1631539270108; Mon, 13 Sep 2021 06:21:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzcTw8iBQqSZqojTcM4kP7OKiemOCKYYc0KcyxRfeOMDAJB3GM+IUl88UZvA8hAphcWLUGHQ== X-Received: by 2002:a7b:cc94:: with SMTP id p20mr10982078wma.75.1631539269943; Mon, 13 Sep 2021 06:21:09 -0700 (PDT) Received: from kozik-lap.lan (lk.84.20.244.219.dc.cable.static.lj-kabel.net. [84.20.244.219]) by smtp.gmail.com with ESMTPSA id n3sm7195888wmi.0.2021.09.13.06.21.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 06:21:09 -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 v2 15/15] nfc: mrvl: drop unneeded memory allocation fail messages Date: Mon, 13 Sep 2021 15:20:35 +0200 Message-Id: <20210913132035.242870-16-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913132035.242870-1-krzysztof.kozlowski@canonical.com> References: <20210913132035.242870-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;