From patchwork Tue Sep 7 12:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5439FC433FE for ; Tue, 7 Sep 2021 12:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D81061102 for ; Tue, 7 Sep 2021 12:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344215AbhIGMTm (ORCPT ); Tue, 7 Sep 2021 08:19:42 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33442 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343867AbhIGMTb (ORCPT ); Tue, 7 Sep 2021 08:19:31 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D2A7040784 for ; Tue, 7 Sep 2021 12:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017104; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jyUbkNv7nILzyveTW7jxCZgSs1rmx3R2NggqiL9rX23ZlrjOC7qGYwo/Z6Pl+9bXQ tY7dz1GeYGgl0Vd0IEAuuSzQPQxIRHoXsNDXy8QLlZcu1eCMOKRRjuN8AK+yvcSboU Nn/tFodei3Qi1jtn6JunhDAWaI//CRW32IT9vhGwHjffOD2ZEdVXVOOx2PvZTh8Ydg lPiA6b00V28yMRED0VYTvk9mW0rsb5ld/FMBKZsdby5wNjSci6vWmbGz5uaPb70dLb uR1YhGwze5n0qDdsw2BtTucZBcpTkz2aio/8L/agf2RgEP3GDDTGBm6/Dp2Qt/mMdx xNIROWBFIGfiw== Received: by mail-wm1-f71.google.com with SMTP id v2-20020a7bcb420000b02902e6b108fcf1so1105295wmj.8 for ; Tue, 07 Sep 2021 05:18:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygx+SrZOuhDRvL55hE9xxzLOd3db853TUebx3pnrgoQ=; b=Y3C55NuVgnDUackcFQ2lxU/pbnyi8AH56nTbz7BpN9wgK52XbgASzVc6u24ROMJDkr FTeZ7OfanV3XL96glwXJWdRrHnVI7rgrX9GCGPzQSti1/pwVWTstnYQe8t8W5XKfDPGw GhghYz8k0AehU0w+blW9aA16wLZaZU5qd8gQkyVM+w6MzSCcLj9C3DQF6FZyJ6UXlOuO XYSXDXsA4ewEZTj/X/ZFPseO+QZJoXihxmmsEoIYA7lZV7owYTIUTMTszEcMj9xwLerF xjCAsFXUkO0x+AJbpD7xdYGN3rZ1xwXmRr0/doUnyPwimeiwkubTBfw6k7CRZ39WnX8A Qdmw== X-Gm-Message-State: AOAM531d87yVPMdotfYZg3xfyKNxpIDbBYJi9nVLGDoXsyjJvbD/uiuz 19lL/UlOHoBpaEPe2cVISa5rPSLZc3favj98NzrlbYamYWYE4ybRlnTw+Vuhhuqm0FpO6CfVF1q IWvHU1p/vgKIApn+pAqBdBQrxViIyB3yknK6npbzpzqOP X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr3576588wml.127.1631017104502; Tue, 07 Sep 2021 05:18:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyB9lpSYRjC+nwBj78YNN3ZDlBL5vpXCZ8sbbrL5Cjob2y7j5eoJJP5w2OFbtm4kDLZhWgyyA== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr3576575wml.127.1631017104347; Tue, 07 Sep 2021 05:18:24 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:23 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 02/15] nfc: do not break pr_debug() call into separate lines Date: Tue, 7 Sep 2021 14:18:03 +0200 Message-Id: <20210907121816.37750-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Remove unneeded line break between pr_debug and arguments. Signed-off-by: Krzysztof Kozlowski --- net/nfc/hci/llc_shdlc.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 78b2ceb8ae6e..e90f70385813 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -201,8 +201,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr) del_timer_sync(&shdlc->t2_timer); shdlc->t2_active = false; - pr_debug - ("All sent frames acked. Stopped T2(retransmit)\n"); + pr_debug("All sent frames acked. Stopped T2(retransmit)\n"); } } else { skb = skb_peek(&shdlc->ack_pending_q); @@ -211,8 +210,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr) msecs_to_jiffies(SHDLC_T2_VALUE_MS)); shdlc->t2_active = true; - pr_debug - ("Start T2(retransmit) for remaining unacked sent frames\n"); + pr_debug("Start T2(retransmit) for remaining unacked sent frames\n"); } } @@ -518,12 +516,11 @@ static void llc_shdlc_handle_send_queue(struct llc_shdlc *shdlc) unsigned long time_sent; if (shdlc->send_q.qlen) - pr_debug - ("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n", - shdlc->send_q.qlen, shdlc->ns, shdlc->dnr, - shdlc->rnr == false ? "false" : "true", - shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr), - shdlc->ack_pending_q.qlen); + pr_debug("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n", + shdlc->send_q.qlen, shdlc->ns, shdlc->dnr, + shdlc->rnr == false ? "false" : "true", + shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr), + shdlc->ack_pending_q.qlen); while (shdlc->send_q.qlen && shdlc->ack_pending_q.qlen < shdlc->w && (shdlc->rnr == false)) { @@ -641,8 +638,7 @@ static void llc_shdlc_sm_work(struct work_struct *work) llc_shdlc_handle_send_queue(shdlc); if (shdlc->t1_active && timer_pending(&shdlc->t1_timer) == 0) { - pr_debug - ("Handle T1(send ack) elapsed (T1 now inactive)\n"); + pr_debug("Handle T1(send ack) elapsed (T1 now inactive)\n"); shdlc->t1_active = false; r = llc_shdlc_send_s_frame(shdlc, S_FRAME_RR, @@ -652,8 +648,7 @@ static void llc_shdlc_sm_work(struct work_struct *work) } if (shdlc->t2_active && timer_pending(&shdlc->t2_timer) == 0) { - pr_debug - ("Handle T2(retransmit) elapsed (T2 inactive)\n"); + pr_debug("Handle T2(retransmit) elapsed (T2 inactive)\n"); shdlc->t2_active = false; From patchwork Tue Sep 7 12:18:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507780 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD475C433EF for ; Tue, 7 Sep 2021 12:19:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D31860F45 for ; Tue, 7 Sep 2021 12:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344562AbhIGMUQ (ORCPT ); Tue, 7 Sep 2021 08:20:16 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33512 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344084AbhIGMTg (ORCPT ); Tue, 7 Sep 2021 08:19:36 -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 269534079A for ; Tue, 7 Sep 2021 12:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017109; bh=ZvGFi5U4zjTh+pnHq+nIFd+NOwEdjR6IPvbXckjfAj8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CYmZKOFezy++0nWrJ0qjVWtfMiOWvQOpGEgJa5q4iKLsqlpefchLg23Ub/gM222S0 vVQuzstVUJJ55pPsrhd1xq2Bx7rGzjV3gZf5/0vcrLWpY1pTp68cmr9PwYZvneF12y N90H03myEkZCMusRkIjFmP5c0Dnc2pFnvISKyhwqp/WW9EJs8pQh2NwuaMiHRjeOjh JuWtop/COEI8b9xCAayiM7NnQXoNSIJNfPkBgWdLk4Qs/0IPL6OH+fhIajKyuyUozE 2IZBIpGmOyTH56mhmHku0agMe+UzlEkyp7b19JWY4yJpn2TqVc9+6V8Ng0yZGs416V mBUYOCCyXd9GA== Received: by mail-wr1-f70.google.com with SMTP id t15-20020a5d42cf000000b001565f9c9ee8so2055487wrr.2 for ; Tue, 07 Sep 2021 05:18:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZvGFi5U4zjTh+pnHq+nIFd+NOwEdjR6IPvbXckjfAj8=; b=F0tVGLDMkOa+Oz1r5Evs2GuQoLOrBd2YI6UqJgq0X3VUIw5O8QwzzcloFCeLqc3j9U d6XO7JAh8y6tVG06H67ewelFSGgilg2wl859xEd/tDlm2OU5Bel3L1PKuiKpUetdO2CH eKUUCQAce8US3aQoLuAiE6DXXPHSOLAIjmfAlFiU5X/DnQ9Scqg8U6r2bNm0jkfyUHWd DgPeyrxbUt/n9ojOH0qvSd+cFP3eT+8FurPatUR6QZyoAdpSwqRWo0eeF+oKcxYslE4D WGljiLkYMbwq0CnFZb+sAfb2PPRwJm1/ksQ5OqfSk9W9X/dF1YS1A1ECyZtQWCe1k9qJ jvCA== X-Gm-Message-State: AOAM530IdEI2sfwuKeP8QgNnXy/Ok96z6umRVw1I71gqzaUYv5BfIK3X r8dX4VYLal9mnbOAb5JzXK5cBe/MtAIxo9mSqW5vWVVZwn8z9Q5z9UNVi8YcU/JsxXYKYKkeeo3 hgKGoASujL1OFRaBPcTGrJntH1Zf2FUctfEqIH+FAohqr X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr18866642wrb.288.1631017108011; Tue, 07 Sep 2021 05:18:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPP0rxMIlB99OlQytxsYXswgaB3Zazfam9ab+Im0W3DSjzmYqWwvuiOBFhSweZVXznCZOlRw== X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr18866621wrb.288.1631017107888; Tue, 07 Sep 2021 05:18:27 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:27 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 05/15] nfc: pn533: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:06 +0200 Message-Id: <20210907121816.37750-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn533/i2c.c | 1 - drivers/nfc/pn533/pn533.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index e6bf8cfe3aa7..91d4a035eb63 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -138,7 +138,6 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data) } client = phy->i2c_dev; - dev_dbg(&client->dev, "IRQ\n"); if (phy->hard_fault != 0) return IRQ_HANDLED; diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index 2f3f3fe9a0ba..c5f127fe2d45 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -1235,8 +1235,6 @@ static void pn533_listen_mode_timer(struct timer_list *t) { struct pn533 *dev = from_timer(dev, t, listen_timer); - dev_dbg(dev->dev, "Listen mode timeout\n"); - dev->cancel_listen = 1; pn533_poll_next_mod(dev); From patchwork Tue Sep 7 12:18:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE260C433F5 for ; Tue, 7 Sep 2021 12:18:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90D7960F45 for ; Tue, 7 Sep 2021 12:18:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344199AbhIGMTy (ORCPT ); Tue, 7 Sep 2021 08:19:54 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:36992 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344150AbhIGMTk (ORCPT ); Tue, 7 Sep 2021 08:19:40 -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 3A8BE3F229 for ; Tue, 7 Sep 2021 12:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017113; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=THvlgJJVPUdS2G4htPrdV0Btl9JrJh9fDSBov0j9gWIRmyu4+OsgSd/dK3DUp2jn2 CLSvm5lBdBBU5P+2DqGMF6n0lS+pzfN7PbB32lKw8/EA0H8xzA9u0fe4kzT+Ud7RgM P9emRigwDxIeS6iMe0iLXGCnlveUChycCN2fO0RIK3Qte8zWeWVgJBY9Bu3ngYgvpL AwPSDFRMp1SW6ReSSJDpUs1+tJk7Yq6jSXZ8dP3uEZXP4AyL8PO7RY0HDOJudrbnoz HUowv9VvGCY8ZP/SIAtUsYf9EVgT5FCGNFSQKL/xVsKVPw90DlkY1W2kPFlBtpF6la W82n2xBhM8pZQ== Received: by mail-wr1-f70.google.com with SMTP id u30-20020adfa19e000000b00159aba4fe42so595909wru.9 for ; Tue, 07 Sep 2021 05:18:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; b=Zf2IbmEx6N2bMVljIH1ez03p2Rrl6IS+0o7Po8mYpw+AoF6btaZhqq10dXCAwzWObA /KH+eaxZnxADQOhHNNivSboefAWqTmzqkXP+rVyM6BtBoWmXy5j6mbRWxHlsWU1f4X5Y ATSDUd1nNmQARMLUVjuYdnl8cI5x0fTj5qmgA1ZoDuNfmhSdll/ceOIM89R/AxI3j5Qs tloQ92gRWVzVdM1kX1AK/TDqPtCnjEFSgp0ecJYjASuU0+1bt9o1WDu/fL4nAJ/sYBuG feYDIltxw/MYqdZE8N0wJPfy7eEfBs/5nrOdcI0jvCeXTl8LMUvVhJHQIyCTdltrn7TV vP0g== X-Gm-Message-State: AOAM533qtPka2I5X4VoK3cs8qcW59tYiLOuLKhr+aofvk/6r0nfsqhYO gIO5NEPGZji82+tK+4ZCPVs0ZTwjmTHc+C75fzcmDW1hAOHb0L62Bwt7apo7X25z7kj5kSBtvcJ bE7Gw/YNIFPu/Ub7sWDf0xc+R5W9sbFqSBCB4VKU0SfG3 X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625645wmk.172.1631017112940; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIRJRBnXqqRi/FyU10IMJdS2aVEiOt1XxAF7EDlHa+Uo5rJJxXcKVpKNVHaNkiAm/uo8/TUg== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625633wmk.172.1631017112788; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:32 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 09/15] nfc: s3fwrn5: simplify dereferencing pointer to struct device Date: Tue, 7 Sep 2021 14:18:10 +0200 Message-Id: <20210907121816.37750-10-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Simplify the code dereferencing several pointers to reach the struct device. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/firmware.c | 29 +++++++++++------------------ drivers/nfc/s3fwrn5/nci.c | 18 +++++++----------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index 1af7a1e632cf..c20fdbac51c5 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -357,6 +357,7 @@ s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo; int ret; @@ -364,8 +365,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Failed to get bootinfo, ret=%02x\n", ret); + dev_err(dev, "Failed to get bootinfo, ret=%02x\n", ret); goto err; } @@ -373,8 +373,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_base_addr(&bootinfo, &fw_info->base_addr); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unknown hardware version\n"); + dev_err(dev, "Unknown hardware version\n"); goto err; } @@ -409,6 +408,7 @@ bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_image *fw = &fw_info->fw; u8 hash_data[SHA1_DIGEST_SIZE]; struct crypto_shash *tfm; @@ -421,8 +421,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) tfm = crypto_alloc_shash("sha1", 0, 0); if (IS_ERR(tfm)) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot allocate shash (code=%pe)\n", tfm); + dev_err(dev, "Cannot allocate shash (code=%pe)\n", tfm); return PTR_ERR(tfm); } @@ -430,21 +429,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) crypto_free_shash(tfm); if (ret) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot compute hash (code=%d)\n", ret); + dev_err(dev, "Cannot compute hash (code=%d)\n", ret); return ret; } /* Firmware update process */ - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: %s\n", fw_info->fw_name); + dev_info(dev, "Firmware update: %s\n", fw_info->fw_name); ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data, SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to enter update mode\n"); + dev_err(dev, "Unable to enter update mode\n"); return ret; } @@ -452,21 +448,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_update_sector(fw_info, fw_info->base_addr + off, fw->image + off); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Firmware update error (code=%d)\n", ret); + dev_err(dev, "Firmware update error (code=%d)\n", ret); return ret; } } ret = s3fwrn5_fw_complete_update_mode(fw_info); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to complete update mode\n"); + dev_err(dev, "Unable to complete update mode\n"); return ret; } - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: success\n"); + dev_info(dev, "Firmware update: success\n"); return ret; } diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c index e374e670b36b..ca6828f55ba0 100644 --- a/drivers/nfc/s3fwrn5/nci.c +++ b/drivers/nfc/s3fwrn5/nci.c @@ -47,6 +47,7 @@ const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = { int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) { + struct device *dev = &info->ndev->nfc_dev->dev; const struct firmware *fw; struct nci_prop_fw_cfg_cmd fw_cfg; struct nci_prop_set_rfreg_cmd set_rfreg; @@ -55,7 +56,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) int i, len; int ret; - ret = request_firmware(&fw, fw_name, &info->ndev->nfc_dev->dev); + ret = request_firmware(&fw, fw_name, dev); if (ret < 0) return ret; @@ -77,13 +78,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) /* Start rfreg configuration */ - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: %s\n", fw_name); + dev_info(dev, "rfreg configuration update: %s\n", fw_name); ret = nci_prop_cmd(info->ndev, NCI_PROP_START_RFREG, 0, NULL); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to start rfreg update\n"); + dev_err(dev, "Unable to start rfreg update\n"); goto out; } @@ -97,8 +96,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_SET_RFREG, len+1, (__u8 *)&set_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "rfreg update error (code=%d)\n", ret); + dev_err(dev, "rfreg update error (code=%d)\n", ret); goto out; } set_rfreg.index++; @@ -110,13 +108,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_STOP_RFREG, sizeof(stop_rfreg), (__u8 *)&stop_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to stop rfreg update\n"); + dev_err(dev, "Unable to stop rfreg update\n"); goto out; } - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: success\n"); + dev_info(dev, "rfreg configuration update: success\n"); out: release_firmware(fw); return ret; From patchwork Tue Sep 7 12:18:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507778 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82DB5C433EF for ; Tue, 7 Sep 2021 12:19:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67B8F610F8 for ; Tue, 7 Sep 2021 12:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344620AbhIGMUV (ORCPT ); Tue, 7 Sep 2021 08:20:21 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33694 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344330AbhIGMTv (ORCPT ); Tue, 7 Sep 2021 08:19:51 -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 D23DB4079C for ; Tue, 7 Sep 2021 12:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017114; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P8NE7jktgFoRLcAw9YKtpxd9cyE05iHpHlXZKxAUKWliYfHfNx+dRXd5HrDcc+eN1 7hdkaH7Q1qRKVmOT9IyEaWQ+0p74/V9ICAYjpS+I11GDYZOI7IYYKZYLe2nDK+0qqE Lxler81NbAzvSk7rcIFlf//Xxa+TcYFHWh81Dv1WzUTUWxR0BlgZdcrM0qGtEqkZyp n00Wm9C5NZaKciupQNoBaRqeqCT8VYM57UD04Lh7oZ2W5S8fv3N+Q08FwOBgNAEm8U /JGztzo5iSGrp06CAcqRGril2z+xNHQM2JmGvw8zSoY100B6Pfd73lHEggtbTBM9Uu sJehb81J6fnjA== Received: by mail-wr1-f70.google.com with SMTP id h1-20020adffd41000000b0015931e17ccfso2040092wrs.18 for ; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dm7SJ/bHwjEDyQ2RFr3SYt5wwlTFgyi3tJxfnWGO4aU=; b=JRsXI2GI7Nmli+EjZd5CDZk3Ph99Q4f1X/Hd3aUnRBr5sjGgMY4qcNonMnaZEwCv6B omndlNiCEGypPPMNHkP/LmL9ERatygBNGMlPvBsuUbWqLvgLmayVbgNtB1QCi5xztwv0 SmKLV+ab7yzaUfCJc4Aw19J8o8mcyqLkkt3eiraA8F9StuxIFHVFMUDES7li/TiJLKYy 3qa41OgjITT2kiIDzgGx+7GIQhaqPt2ZBWaEPq/YL7lAynngEVcJJ+BGHN1IgwkSb0CK HbfCWUBqnKOgclzCFvWCsCu+TSMpPkcwmMsdsJP2ngaZ7pjfXx/cutYM5rBgaixFp4tW Sx2A== X-Gm-Message-State: AOAM533EfIq3fRW7NIoWa9J1iIo1zvRZaLmC1JBN/izFYbMkfGsuL02V SapZyHm+8svkS5j0H3sGJScuwRJKl00NtHvswnfnoks0794dSpgFGcHJUM0jmnuUk/q1MC7aYOB iGotufSxNdGZWhMeZ5Li8SiyfRrK+/+gx+lMrC6d0/a7J X-Received: by 2002:a05:600c:22d2:: with SMTP id 18mr3809631wmg.57.1631017114368; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5jtNrITmHBDgLaBbxdrMwDPzRPd9HWI65g33beGxYwDoKNU0TPfWLbynhjY+3UZBxDrACFA== X-Received: by 2002:a05:600c:22d2:: with SMTP id 18mr3809616wmg.57.1631017114195; Tue, 07 Sep 2021 05:18:34 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:33 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 10/15] nfc: st-nci: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:11 +0200 Message-Id: <20210907121816.37750-11-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org ftrace is a preferred and standard way to debug entering and exiting functions so drop useless debug prints. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/st-nci/i2c.c | 4 ---- drivers/nfc/st-nci/ndlc.c | 4 ---- drivers/nfc/st-nci/se.c | 6 ------ drivers/nfc/st-nci/spi.c | 4 ---- 4 files changed, 18 deletions(-) diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index ccf6152ebb9f..cbd968f013c7 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -157,7 +157,6 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) { struct st_nci_i2c_phy *phy = phy_id; - struct i2c_client *client; struct sk_buff *skb = NULL; int r; @@ -166,9 +165,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - client = phy->i2c_dev; - dev_dbg(&client->dev, "IRQ\n"); - if (phy->ndlc->hard_fault) return IRQ_HANDLED; diff --git a/drivers/nfc/st-nci/ndlc.c b/drivers/nfc/st-nci/ndlc.c index e9dc313b333e..755460a73c0d 100644 --- a/drivers/nfc/st-nci/ndlc.c +++ b/drivers/nfc/st-nci/ndlc.c @@ -239,8 +239,6 @@ static void ndlc_t1_timeout(struct timer_list *t) { struct llt_ndlc *ndlc = from_timer(ndlc, t, t1_timer); - pr_debug("\n"); - schedule_work(&ndlc->sm_work); } @@ -248,8 +246,6 @@ static void ndlc_t2_timeout(struct timer_list *t) { struct llt_ndlc *ndlc = from_timer(ndlc, t, t2_timer); - pr_debug("\n"); - schedule_work(&ndlc->sm_work); } diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 5fd89f72969d..7764b1a4c3cf 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -638,8 +638,6 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, { struct st_nci_info *info = nci_get_drvdata(ndev); - pr_debug("\n"); - switch (se_idx) { case ST_NCI_ESE_HOST_ID: info->se_info.cb = cb; @@ -671,8 +669,6 @@ static void st_nci_se_wt_timeout(struct timer_list *t) u8 param = 0x01; struct st_nci_info *info = from_timer(info, t, se_info.bwi_timer); - pr_debug("\n"); - info->se_info.bwi_active = false; if (!info->se_info.xch_error) { @@ -692,8 +688,6 @@ static void st_nci_se_activation_timeout(struct timer_list *t) struct st_nci_info *info = from_timer(info, t, se_info.se_active_timer); - pr_debug("\n"); - info->se_info.se_active = false; complete(&info->se_info.req_completion); diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c index a620c34790e6..af1f04c306cc 100644 --- a/drivers/nfc/st-nci/spi.c +++ b/drivers/nfc/st-nci/spi.c @@ -169,7 +169,6 @@ static int st_nci_spi_read(struct st_nci_spi_phy *phy, static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) { struct st_nci_spi_phy *phy = phy_id; - struct spi_device *dev; struct sk_buff *skb = NULL; int r; @@ -178,9 +177,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - dev = phy->spi_dev; - dev_dbg(&dev->dev, "IRQ\n"); - if (phy->ndlc->hard_fault) return IRQ_HANDLED; From patchwork Tue Sep 7 12:18:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27581C433FE for ; Tue, 7 Sep 2021 12:19:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 145DA610FF for ; Tue, 7 Sep 2021 12:19:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344599AbhIGMUT (ORCPT ); Tue, 7 Sep 2021 08:20:19 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33696 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344087AbhIGMTv (ORCPT ); Tue, 7 Sep 2021 08:19:51 -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 C4D404019C for ; Tue, 7 Sep 2021 12:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017115; bh=Puh8mRYPY/DpKQ/I9uyYNXcSBWp/u+3lkb87itcd3n8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uUM0PGv4Rfv1eIcr/jyhIigDDP8aHrh/h5BVxfaJ8Y/CnfjE8YPeL7liuR927Teqq STekRzWqNFsFiHoLo5t/iynyWYXVdQ0HGA5UBL6syWw1UeEWS+ORr/8D7DEu4OLJmW ZDegXvvAx1ePauQZeHS74aULclKv5J+6S8N3GUkIGtCMEAPt8hydng134zw5kYMc2S 8H912pfWb6qtYXviPK2WAMfiWwzJCQfuzaAGYfjPqE6xf3FqovXyzbd/lzwFplv1Es 2L/oX5igL3KDFVgiCFEUnR5ClL8RhnvuKBRKkZ9TcB8yHNTBCTVCY1s7+y2G6Jhg45 TkVBqvd3XDtRA== Received: by mail-wm1-f70.google.com with SMTP id u1-20020a05600c210100b002e74fc5af71so3326296wml.1 for ; Tue, 07 Sep 2021 05:18:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Puh8mRYPY/DpKQ/I9uyYNXcSBWp/u+3lkb87itcd3n8=; b=garm8dBNiPezafHBesqUYF4OB2QfkF1lwORU1uZp1NZbMsPjNCnAQtbNrfmesRTTZw CkDdn91rTS43VbWl4jk9U1AORgeWdQ69k57kn0A9gKO8M3MH0jhp4YTHo2LRgK6oZf6d KzjUJEs0oMBWQB4R7aPfpwvbgqDhPsU8jcwhH816E8R5U7vC7mU0pjZPmzBvoyTJKIFr b1EYOy541pkuX68jdTJTqiiM85tGue9nlctwtEnUHahhJBso8fiWpg63APAybToInAmw spcGLhpdh8zZTKF+RJxBzZAYbQB0tne0VVggdzU6/9fQG7MLE+FnLMiHoGeK9ialbazt VGRg== X-Gm-Message-State: AOAM530faY9li+5ct4tX/Q5A2giVfhYhddZxJfOdyTJKnqHivroIaQA9 tfRIrjsu3ad0Fce0P4XNpKZ9pF9Iw0C4Y/IcVZkfF1zDPctnooodNhubPLdfp1JHnStCxcxCOt7 eU491kcKePyRq8GIZcduRGUsBTagVPvNh5q3JEkokYCGg X-Received: by 2002:adf:f490:: with SMTP id l16mr18418669wro.136.1631017115522; Tue, 07 Sep 2021 05:18:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLMJx55+Q/WM79I6j8ltV38paMRUj8UUI3CoLPAg5wP7ajpWFYZY+esfWvjPdv6zq3PNmHWg== X-Received: by 2002:adf:f490:: with SMTP id l16mr18418651wro.136.1631017115342; Tue, 07 Sep 2021 05:18:35 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:35 -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 11/15] nfc: st21nfca: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:12 +0200 Message-Id: <20210907121816.37750-12-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 Tue Sep 7 12:18:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38F08C433FE for ; Tue, 7 Sep 2021 12:19:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FEDF610F8 for ; Tue, 7 Sep 2021 12:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344161AbhIGMUg (ORCPT ); Tue, 7 Sep 2021 08:20:36 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:36948 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344351AbhIGMTw (ORCPT ); Tue, 7 Sep 2021 08:19:52 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E0C68407AA for ; Tue, 7 Sep 2021 12:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017116; bh=vC5ZeeYLEo1QgnDozyJaTYMB8bYZWzk5ZY30xgpVgcM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tTyMQxiqTAGMXRkmo9aHy0Xh+NsYkcZDhsUaVu85+4GuPOu9SaUXKoB2Iyx/MHECt JghnYmR3Fx7/fYl/JhRoZiDqs/+/CpB026Q6ZS7On+U67bQEM7KVlat4H5qoHfL0lv dQGOleE7W5aYRGU3H6P1c18o4PgigX9xzN6zByLmOUuhB44uwsuKSZ1SI5yT5bgOv9 /PmIszq/E4HIPhCSdDdMiB4FPIvhT5scRHX4U5Er1slOAmB45HEcu5o2jSelxEktTi Hmo+ydRKBS23PPyvSV9RBC6rrqHxm3JWGEIfNOcx6j2Om3olCEiLwstCOT7wVZ0JXI 444hpHS4Gw4uA== Received: by mail-wm1-f70.google.com with SMTP id u14-20020a7bcb0e0000b0290248831d46e4so1033210wmj.6 for ; Tue, 07 Sep 2021 05:18:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vC5ZeeYLEo1QgnDozyJaTYMB8bYZWzk5ZY30xgpVgcM=; b=j4GZyiZLZ/R2F0bNnhO16sjRuB5A/BVmj0SY00u0tUCb5oReOTvrjkN10xO1Ivwt1w aZGaeLDh9lnidph8BkOSW+eq0aLz50kfd1iwoVcbqulP5V7FJPqEzEZGOXwGpZDOJFfp dnomVLBp2fQ6b1AxR+Cve7lKUlDMMZLbcygrz4OwRofOxN9h1N+0zTTk+LkeVOEcZlb9 /y5NmZ+ubqYQKZpxma7mCrajdWWt1tr873hvnXVFkQs/2oOnrWNHnC0WvM7UpyrGiDFN 4XhIzMRB41co+EJxggRASAzNE6aNH5aSaiT7OXytVIHrQvYMcG4Cj1MEbf+wtaGDwck7 wzFg== X-Gm-Message-State: AOAM5334Gbiw0wA3lEEQ8ZnvzDbfuBnlN/EIjPq/bW0mbD7qfdIyBfSt 3T1UiYbmu9JUIQ20nxuxHQyBypyuCtjuP9qphjFufT/9PyhFu/Lb7o5vyI4/ryL72AjdXr4lmU3 CDSg03+1CyWpWBvafhGnEGYm0nQ9oN5yEW1JLdLgnCg6X X-Received: by 2002:a05:600c:350b:: with SMTP id h11mr3654650wmq.101.1631017116587; Tue, 07 Sep 2021 05:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1nc8FfA3NegAiSteStJpWLEeZZ3ZcnTr4pnxkPwnCbeOusix2fXAFJixkw6WN/2ypjZQRhw== X-Received: by 2002:a05:600c:350b:: with SMTP id h11mr3654639wmq.101.1631017116468; Tue, 07 Sep 2021 05:18:36 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:36 -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 12/15] nfc: trf7970a: drop unneeded debug prints Date: Tue, 7 Sep 2021 14:18:13 +0200 Message-Id: <20210907121816.37750-13-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 Tue Sep 7 12:18:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 507776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90423C433EF for ; Tue, 7 Sep 2021 12:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78B4960F45 for ; Tue, 7 Sep 2021 12:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344494AbhIGMUz (ORCPT ); Tue, 7 Sep 2021 08:20:55 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:33682 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344473AbhIGMUC (ORCPT ); Tue, 7 Sep 2021 08:20:02 -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-1.canonical.com (Postfix) with ESMTPS id AC76540827 for ; Tue, 7 Sep 2021 12:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017120; bh=IGi454bY1uM8p5QRZSKGDo9YXvHCL/LufQFtzz+SznM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BKgQmkFGobUvYp4GFsCJgQW/pS4+dZHWtVS2CgD0+/SI7oAylF4qKPMClkPE2XS9K KiZgUKdoGhiybUMClbmES0ASH/vud9PeZBpFkNjWyNt1E5o1XhJkp7Rpx++N8C3zW6 Ho1loJ4DQ2kx8RN6QMF24nvlqOSbTPQAKgfAid2UyNRputTZHAaoQs+OO5q23+jOtk x6M9WFETDet2o8tUchLOwI9jxOtL8VKItU8ahicahuLk/ImV0VX/13u7+cHFhCxhbQ ZXqRG6pQpbHxYhkM5caBjQto37Wy/nRNpkqVFkWT+0GhNR+RcCyPMu8vz/LMs5nc6E 2oXBE6+0V5CTw== Received: by mail-wm1-f72.google.com with SMTP id n16-20020a1c7210000000b002ea2ed60dc6so861643wmc.0 for ; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IGi454bY1uM8p5QRZSKGDo9YXvHCL/LufQFtzz+SznM=; b=eB0Zg39esto4SSxYn/M9A0KTqtDrpt+KmbZ6Dqf8qcUBER9kxlhP3McEOrxrnUm0zE sNTfYKtmVtZrFaEFVRk8WEVPHbM1TE6JZ8DLGmlnf0issNGVdxcqyRJIaSy9Z8rDctzo RFGMNJuzpf23tYwtPsrhevUnw2Pv7M7yWQsCHSsu7opWAp5cK8al9Xs+u7jt7VBsJx4x 59QwCxqIpyU9tLW+G7OOqytUerPALoT9P4RHMBJNmX4Q5uytmhYauXJjd2qpnTUvFK8U NGfTYW2+Nr2qawlV0R1LPqPcj7r92pUcNxQHFDqDEZu9//ChUO2DWgDaaYmb6Ze+C4Rl 9Z6A== X-Gm-Message-State: AOAM533ZM4kRl1zkSA7dq7d1ZsMTQXdcpkhicpfa2U6T0spDKw88c2pL 6yNghOOEmTm0EawHU7KmNlkbl68uoyVrwiMu+Qtj8Uq80CVxyyJDpwaJpalODv4lH9KwysrUcg5 nEexRHt4L16/O6RwsKxeUzegDR4FwbIJR77VgucAjwh1D X-Received: by 2002:a05:600c:1d27:: with SMTP id l39mr3629442wms.146.1631017120416; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzkQReT6hqXvnsRi4xVMvPv5mwLHDY/KqHilLqyCDbOJpRRpQ8tjRRU7brxn8w70vPDRKkmA== X-Received: by 2002:a05:600c:1d27:: with SMTP id l39mr3629425wms.146.1631017120289; Tue, 07 Sep 2021 05:18:40 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:39 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 15/15] nfc: mrvl: drop unneeded memory allocation fail messages Date: Tue, 7 Sep 2021 14:18:16 +0200 Message-Id: <20210907121816.37750-16-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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;