From patchwork Mon May 31 07:35: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: 451893 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=-16.8 required=3.0 tests=BAYES_00, 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 BA59AC4708F for ; Mon, 31 May 2021 07:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98D42611CA for ; Mon, 31 May 2021 07:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbhEaHhP (ORCPT ); Mon, 31 May 2021 03:37:15 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60529 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbhEaHhJ (ORCPT ); Mon, 31 May 2021 03:37:09 -0400 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncSP-0002h6-Rd for netdev@vger.kernel.org; Mon, 31 May 2021 07:35:29 +0000 Received: by mail-wm1-f72.google.com with SMTP id g9-20020a05600c4ec9b0290198e2707cecso1803164wmq.3 for ; Mon, 31 May 2021 00:35: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:mime-version :content-transfer-encoding; bh=XhZpqiw5yroQ5T5SjmtgyekQkcqwTSamV1tsKU5zvv4=; b=o3tzuHpAejnpFkIRe+8gS03Iah1xbYZqsb7omldsfbYSXSJnCbJvKmdCLzSNB7Ob1P R7z+T3nlg1TCJnetb5ILi30McjPmKxniGsT2RO4PbUqfb06HtScLF/kjesxyjX+oM9s4 jEY2MdmdD1Eeqgpj3jccYw+NLG0UKW9N+f1goeF/2sJUNZ9xIVrrfj2PkVBW3zVR9Wkr e/OXN/W5FFj1uW/PyQycO+aEAeKWvUTme5yaHMnB1sfgYmzxuwvCoTgdFo3p8gWMzy7a GzfE8IuFxOiL4fDIG7KvU5P8PSn7quLp1+9h9SgLlXrcyGQ8C2HK5aeSyzEDxlYw+x01 6zWQ== X-Gm-Message-State: AOAM532P8YkkMmHbzKlAPVlJizOTH+C7Xb5XV+6j/3SEkpzp0v3yF67K mYJ34Vfs3C/pBMEGjos50dYCRr03khnW4tOS73SwIKUslsxmaBCMEkDUD1Dco/NavCYoaIUyJox Pa3jcK9D3kTj0BbxzsHiL4LRFbrIxww4WOA== X-Received: by 2002:a5d:6701:: with SMTP id o1mr21259649wru.390.1622446529559; Mon, 31 May 2021 00:35:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxk5BA7dTNQ/7+z47YXbPG4XygKbY+0a1oPfGA6FykbFNsBqdHggXywOWUiRmA9mrf397cOBg== X-Received: by 2002:a5d:6701:: with SMTP id o1mr21259636wru.390.1622446529384; Mon, 31 May 2021 00:35:29 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id g10sm17217780wrq.12.2021.05.31.00.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:35:29 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 01/11] nfc: fdp: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:35:12 +0200 Message-Id: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. This allows also to remove several local variables and entire fdp_nci_recv_frame() function (whose purpose was only to log). Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/fdp/fdp.c | 31 ------------------------------- drivers/nfc/fdp/fdp.h | 1 - drivers/nfc/fdp/i2c.c | 12 +----------- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c index 125d71c27b8b..7863b2536999 100644 --- a/drivers/nfc/fdp/fdp.c +++ b/drivers/nfc/fdp/fdp.c @@ -237,28 +237,18 @@ static int fdp_nci_send_patch(struct nci_dev *ndev, u8 conn_id, u8 type) static int fdp_nci_open(struct nci_dev *ndev) { struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - - dev_dbg(dev, "%s\n", __func__); return info->phy_ops->enable(info->phy); } static int fdp_nci_close(struct nci_dev *ndev) { - struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - - dev_dbg(dev, "%s\n", __func__); return 0; } static int fdp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) { struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - - dev_dbg(dev, "%s\n", __func__); if (atomic_dec_and_test(&info->data_pkt_counter)) info->data_pkt_counter_cb(ndev); @@ -266,16 +256,6 @@ static int fdp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) return info->phy_ops->write(info->phy, skb); } -int fdp_nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb) -{ - struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - - dev_dbg(dev, "%s\n", __func__); - return nci_recv_frame(ndev, skb); -} -EXPORT_SYMBOL(fdp_nci_recv_frame); - static int fdp_nci_request_firmware(struct nci_dev *ndev) { struct fdp_nci_info *info = nci_get_drvdata(ndev); @@ -476,8 +456,6 @@ static int fdp_nci_setup(struct nci_dev *ndev) int r; u8 patched = 0; - dev_dbg(dev, "%s\n", __func__); - r = nci_core_init(ndev); if (r) goto error; @@ -585,9 +563,7 @@ static int fdp_nci_core_reset_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) { struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - dev_dbg(dev, "%s\n", __func__); info->setup_reset_ntf = 1; wake_up(&info->setup_wq); @@ -598,9 +574,7 @@ static int fdp_nci_prop_patch_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) { struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - dev_dbg(dev, "%s\n", __func__); info->setup_patch_ntf = 1; info->setup_patch_status = skb->data[0]; wake_up(&info->setup_wq); @@ -773,11 +747,6 @@ EXPORT_SYMBOL(fdp_nci_probe); void fdp_nci_remove(struct nci_dev *ndev) { - struct fdp_nci_info *info = nci_get_drvdata(ndev); - struct device *dev = &info->phy->i2c_dev->dev; - - dev_dbg(dev, "%s\n", __func__); - nci_unregister_device(ndev); nci_free_device(ndev); } diff --git a/drivers/nfc/fdp/fdp.h b/drivers/nfc/fdp/fdp.h index 9bd1f3f23e2d..ead3b21ccae6 100644 --- a/drivers/nfc/fdp/fdp.h +++ b/drivers/nfc/fdp/fdp.h @@ -25,6 +25,5 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops, struct nci_dev **ndev, int tx_headroom, int tx_tailroom, u8 clock_type, u32 clock_freq, u8 *fw_vsc_cfg); void fdp_nci_remove(struct nci_dev *ndev); -int fdp_nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb); #endif /* __LOCAL_FDP_H_ */ diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index 997e0806821a..c5596e514648 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -49,7 +49,6 @@ static int fdp_nci_i2c_enable(void *phy_id) { struct fdp_i2c_phy *phy = phy_id; - dev_dbg(&phy->i2c_dev->dev, "%s\n", __func__); fdp_nci_i2c_reset(phy); return 0; @@ -59,7 +58,6 @@ static void fdp_nci_i2c_disable(void *phy_id) { struct fdp_i2c_phy *phy = phy_id; - dev_dbg(&phy->i2c_dev->dev, "%s\n", __func__); fdp_nci_i2c_reset(phy); } @@ -197,7 +195,6 @@ static int fdp_nci_i2c_read(struct fdp_i2c_phy *phy, struct sk_buff **skb) static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) { struct fdp_i2c_phy *phy = phy_id; - struct i2c_client *client; struct sk_buff *skb; int r; @@ -206,9 +203,6 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) return IRQ_NONE; } - client = phy->i2c_dev; - dev_dbg(&client->dev, "%s\n", __func__); - r = fdp_nci_i2c_read(phy, &skb); if (r == -EREMOTEIO) @@ -217,7 +211,7 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) return IRQ_HANDLED; if (skb != NULL) - fdp_nci_recv_frame(phy->ndev, skb); + nci_recv_frame(phy->ndev, skb); return IRQ_HANDLED; } @@ -288,8 +282,6 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) u32 clock_freq; int r = 0; - dev_dbg(dev, "%s\n", __func__); - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { nfc_err(dev, "No I2C_FUNC_I2C support\n"); return -ENODEV; @@ -351,8 +343,6 @@ static int fdp_nci_i2c_remove(struct i2c_client *client) { struct fdp_i2c_phy *phy = i2c_get_clientdata(client); - dev_dbg(&client->dev, "%s\n", __func__); - fdp_nci_remove(phy->ndev); fdp_nci_i2c_disable(phy); From patchwork Mon May 31 07:35: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: 450755 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=-16.8 required=3.0 tests=BAYES_00, 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 E7017C4708F for ; Mon, 31 May 2021 07:35:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5CB06127A for ; Mon, 31 May 2021 07:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230397AbhEaHh1 (ORCPT ); Mon, 31 May 2021 03:37:27 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60550 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230406AbhEaHhW (ORCPT ); Mon, 31 May 2021 03:37:22 -0400 Received: from mail-lj1-f199.google.com ([209.85.208.199]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncSc-0002kR-At for netdev@vger.kernel.org; Mon, 31 May 2021 07:35:42 +0000 Received: by mail-lj1-f199.google.com with SMTP id r15-20020a2eb60f0000b02900eddb317c52so3103757ljn.21 for ; Mon, 31 May 2021 00:35:42 -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=aZ/yEEfClIlXQJ5jqul7RvuQr6Fao3s7oVlySYMna4M=; b=TndFvjbUhNswaC4r9JvSe7wOfvHH+AsjUCLFIYcyFioWelzrtWEyqff+/NF/Pr8Wki QrhaIVpFxevkIQvq5ju9VvP+8dcq5zeQpanCAYP/9Hi9U9mQlGTav+eA3lHaROHIUZ/f W0QS6zLUHMoOI38rAqTAAd1I8zhj1qNcQ51fhTKiECDytXWVjHbfg0aXJLoUxF6JU7Wn X3Eq/JagOzpYvHMc1khBMW6+l3O1u67255YxNkNYC236Mt/pJSyssVj2tkJ2F8kwKWlf Rc/n5oMmZrUbao7lyTXkmHAWblmBdJuybo2SWhRDQREX6iVjj1a4vJXmwwSUCeMudrd3 ai0Q== X-Gm-Message-State: AOAM530rYjHTFSTuUt3qZnNBhmJiJQGiLWIIsPrZ4bM+XdTjpjrhdg0G jBoKEsbG+eb9yRxU+nt0FbFSbBoGxlPBh+gtdHtohuhoFPPE101Jd7MIuxh6y8RUWpD/HWeptHX 3cLSGoy0l+8gycr8Uk1WO2S5yTFogNGAq4Q== X-Received: by 2002:a2e:9601:: with SMTP id v1mr15886354ljh.45.1622446541516; Mon, 31 May 2021 00:35:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+Tjd38dgYDCjWZAbxLIql+xzbe6YJpMcx4uGiK1i65n63byVeYJmdFScIYhnsVbjRxpSXzw== X-Received: by 2002:adf:8bc9:: with SMTP id w9mr19323503wra.378.1622446530398; Mon, 31 May 2021 00:35:30 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id g10sm17217780wrq.12.2021.05.31.00.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:35:29 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 02/11] nfc: mei_phy: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:35:13 +0200 Message-Id: <20210531073522.6720-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/mei_phy.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c index 0f43bb389566..e56cea716cd2 100644 --- a/drivers/nfc/mei_phy.c +++ b/drivers/nfc/mei_phy.c @@ -98,8 +98,6 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) size_t if_version_length; int bytes_recv, r; - pr_info("%s\n", __func__); - memset(&cmd, 0, sizeof(struct mei_nfc_cmd)); cmd.hdr.cmd = MEI_NFC_CMD_MAINTENANCE; cmd.hdr.data_size = 1; @@ -146,8 +144,6 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) size_t connect_length, connect_resp_length; int bytes_recv, r; - pr_info("%s\n", __func__); - connect_length = sizeof(struct mei_nfc_cmd) + sizeof(struct mei_nfc_connect); @@ -320,8 +316,6 @@ static int nfc_mei_phy_enable(void *phy_id) int r; struct nfc_mei_phy *phy = phy_id; - pr_info("%s\n", __func__); - if (phy->powered == 1) return 0; @@ -363,8 +357,6 @@ static void nfc_mei_phy_disable(void *phy_id) { struct nfc_mei_phy *phy = phy_id; - pr_info("%s\n", __func__); - mei_cldev_disable(phy->cldev); phy->powered = 0; From patchwork Mon May 31 07:35:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 450756 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=-16.8 required=3.0 tests=BAYES_00, 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 1DA3BC4708F for ; Mon, 31 May 2021 07:35:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3CAA6127A for ; Mon, 31 May 2021 07:35:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230383AbhEaHhS (ORCPT ); Mon, 31 May 2021 03:37:18 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60533 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbhEaHhL (ORCPT ); Mon, 31 May 2021 03:37:11 -0400 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncSR-0002hi-Tx for netdev@vger.kernel.org; Mon, 31 May 2021 07:35:31 +0000 Received: by mail-wm1-f72.google.com with SMTP id n127-20020a1c27850000b02901717a27c785so4429183wmn.9 for ; Mon, 31 May 2021 00:35:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JmosCUrJkhqoGDagpIXrPPS//+f2tiAx4PxvTD+0vzc=; b=KxdUEY9a+QWLl5bnVusrCiTIiLsYAWZJJ3XjSXT3XPu+ihWWbbYntL5yI1zFjzO1y4 2Vw6nCFF+TeUyXOo32OEtkMVVIHWbNTbpnSJNuBHNo1TvKYqKiskHGNCGMfSem7g5eEC gqCbzX5ec9SZDK+ppVI8gCVDohcmNYdnE+bioRaCK8xtuoKI6Z3dPrNy1KiQ7hqq8jeR g7uzqfG8DUuWK2mxZ4fzZ++iCorjtMlBtJ8ijzWZRd+jJmazMIilnqyv+7ihkXcDsDCP zuB3LZ21NvHNP/LhuQayNsTk2KQQl/OH033vmU9C7y+XNtI8qNj7zRyRFlT+QTKaWw7f qf1Q== X-Gm-Message-State: AOAM533RtywY8qohsy7IwbA6opheBzjmx3vYnBCM+CEDHRx2+SwHaI8W VzN3kM4BHbr32o8cMUoUJDtMkoYRvR/vcem0c8htpxaLKehqcI/PXmYONNimVPmtpY+fXUBwFeN MBQAJH6j5SQdJn+cII0AnhdOBiI/HOhESOg== X-Received: by 2002:adf:bc06:: with SMTP id s6mr13230774wrg.250.1622446531210; Mon, 31 May 2021 00:35:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/SAo+136ZY4ki3Yjmxa9I5pVJzmJ5Qz3WO+6pZiolXWGniwPT7ol1K37M1TrQfTyMcnvzwQ== X-Received: by 2002:adf:bc06:: with SMTP id s6mr13230764wrg.250.1622446531011; Mon, 31 May 2021 00:35:31 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id g10sm17217780wrq.12.2021.05.31.00.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:35:30 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 03/11] nfc: mrvl: use SPDX-License-Identifier Date: Mon, 31 May 2021 09:35:14 +0200 Message-Id: <20210531073522.6720-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use SPDX-License-Identifier: GPL-2.0-only, instead of hand writing it. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/nfcmrvl/fw_dnld.c | 13 +------------ drivers/nfc/nfcmrvl/fw_dnld.h | 15 ++------------- drivers/nfc/nfcmrvl/i2c.c | 15 ++------------- drivers/nfc/nfcmrvl/main.c | 13 +------------ drivers/nfc/nfcmrvl/nfcmrvl.h | 15 ++------------- drivers/nfc/nfcmrvl/spi.c | 15 ++------------- drivers/nfc/nfcmrvl/uart.c | 13 +------------ drivers/nfc/nfcmrvl/usb.c | 15 ++------------- 8 files changed, 13 insertions(+), 101 deletions(-) diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c index 52c8ae504e32..05df7ad224d5 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -1,19 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC driver: Firmware downloader * * 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. */ #include diff --git a/drivers/nfc/nfcmrvl/fw_dnld.h b/drivers/nfc/nfcmrvl/fw_dnld.h index 058ce77b3cbc..7c4d91b01910 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.h +++ b/drivers/nfc/nfcmrvl/fw_dnld.h @@ -1,20 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Marvell NFC driver: Firmware downloader * * 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. - **/ + */ #ifndef __NFCMRVL_FW_DNLD_H__ #define __NFCMRVL_FW_DNLD_H__ diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c index 3c9bbee98237..59a529e72d96 100644 --- a/drivers/nfc/nfcmrvl/i2c.c +++ b/drivers/nfc/nfcmrvl/i2c.c @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC-over-I2C driver: I2C interface related functions * * 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. - **/ + */ #include #include diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index 529be35ac178..a4620b480c4f 100644 --- a/drivers/nfc/nfcmrvl/main.c +++ b/drivers/nfc/nfcmrvl/main.c @@ -1,19 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC driver: major functions * * Copyright (C) 2014-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. */ #include diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h index e84ee18c73ae..0b4220bb91bc 100644 --- a/drivers/nfc/nfcmrvl/nfcmrvl.h +++ b/drivers/nfc/nfcmrvl/nfcmrvl.h @@ -1,20 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Marvell NFC driver * * Copyright (C) 2014-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. - **/ + */ #ifndef _NFCMRVL_H_ #define _NFCMRVL_H_ diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c index 0647b85930a6..66696321c645 100644 --- a/drivers/nfc/nfcmrvl/spi.c +++ b/drivers/nfc/nfcmrvl/spi.c @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC-over-SPI driver: SPI interface related functions * * 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. - **/ + */ #include #include diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c index 7194dd7ef0f1..d7ba5b5c653c 100644 --- a/drivers/nfc/nfcmrvl/uart.c +++ b/drivers/nfc/nfcmrvl/uart.c @@ -1,19 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC-over-UART driver * * 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. */ #include diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c index bcd563cb556c..50f06dd1ba25 100644 --- a/drivers/nfc/nfcmrvl/usb.c +++ b/drivers/nfc/nfcmrvl/usb.c @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Marvell NFC-over-USB driver: USB interface related functions * * Copyright (C) 2014, 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. - **/ + */ #include #include From patchwork Mon May 31 07:35:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 451892 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=-16.8 required=3.0 tests=BAYES_00, 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 A2E01C4708F for ; Mon, 31 May 2021 07:35:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84D2461284 for ; Mon, 31 May 2021 07:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230407AbhEaHhV (ORCPT ); Mon, 31 May 2021 03:37:21 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60538 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230235AbhEaHhM (ORCPT ); Mon, 31 May 2021 03:37:12 -0400 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncSS-0002ht-8l for netdev@vger.kernel.org; Mon, 31 May 2021 07:35:32 +0000 Received: by mail-wr1-f72.google.com with SMTP id j33-20020adf91240000b029010e4009d2ffso3657700wrj.0 for ; Mon, 31 May 2021 00:35:32 -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=I8v9v1iXBx2jm0a7G/yvgftchrd3//zSZLWiRRhEhPU=; b=ISexMt3wn0ja9aqcgQOCQ9/0CKYrEPqZeFU0h+UJDpjHxPekr565zck2aZPbVOYMnV JE3AEQ2r2EFUjneXKBifwRSEITI4yzHIagCb9Xir4wA/a3/so3VRFZWBdZA8c61d/lrS cvmI/lmshbgRNd+gt/j4G2ZsrchzwreZzzOjWBBUXz/Ix68E4QH9Hp8d05N2SWbfcy2k mm3gYgoB7wUUCv+PkpmH7IoOZgbOP5TOJOs8uB9of9GHa4mDGi34JdpAFDHScpRu95wf 8U+/e48qPQk1L6mTJJAsavvAMKBQ3SwUIaswyajgWc+CW3cSqwCIfXbmBSPEzXJlw90J QfCQ== X-Gm-Message-State: AOAM533unN/0G/XONyaDg0MSxlFTuZuTCuCE/Ilbn+AOYXNIzViCoO26 wbWMxnH6XB1FwA4+8bUHLkfU3/xrpHrINeAHECqOzj7zpnUeBmOdfKCNEhrUKL18KXJ8LJ0a0eb TjXx7Z+L5DSK991R6c+6Gwow06P3OuKB+Vg== X-Received: by 2002:a5d:638b:: with SMTP id p11mr20588804wru.90.1622446531821; Mon, 31 May 2021 00:35:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN8l014nNSn/nR7ANz8+qDfBqJHPKgzAKmFbf7KYei5XSqunWARV9KN/pEJy19j+LeR5n4+w== X-Received: by 2002:a5d:638b:: with SMTP id p11mr20588793wru.90.1622446531657; Mon, 31 May 2021 00:35:31 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id g10sm17217780wrq.12.2021.05.31.00.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:35:31 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 04/11] nfc: mrvl: correct minor coding style violations Date: Mon, 31 May 2021 09:35:15 +0200 Message-Id: <20210531073522.6720-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Correct block comments and usage of tab in function definition. No functional change. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/nfcmrvl/fw_dnld.c | 10 +++++----- drivers/nfc/nfcmrvl/nfcmrvl.h | 12 ++++++------ drivers/nfc/nfcmrvl/uart.c | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c index 05df7ad224d5..c84658448415 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -39,8 +39,8 @@ enum { }; /* -** Patterns for responses -*/ + * Patterns for responses + */ static const uint8_t nci_pattern_core_reset_ntf[] = { 0x60, 0x00, 0x02, 0xA0, 0x01 @@ -440,7 +440,7 @@ static void fw_dnld_rx_work(struct work_struct *work) } } -int nfcmrvl_fw_dnld_init(struct nfcmrvl_private *priv) +int nfcmrvl_fw_dnld_init(struct nfcmrvl_private *priv) { char name[32]; @@ -454,12 +454,12 @@ int nfcmrvl_fw_dnld_init(struct nfcmrvl_private *priv) return 0; } -void nfcmrvl_fw_dnld_deinit(struct nfcmrvl_private *priv) +void nfcmrvl_fw_dnld_deinit(struct nfcmrvl_private *priv) { destroy_workqueue(priv->fw_dnld.rx_wq); } -void nfcmrvl_fw_dnld_recv_frame(struct nfcmrvl_private *priv, +void nfcmrvl_fw_dnld_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb) { /* Discard command timer */ diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h index 0b4220bb91bc..a715543bc9bf 100644 --- a/drivers/nfc/nfcmrvl/nfcmrvl.h +++ b/drivers/nfc/nfcmrvl/nfcmrvl.h @@ -25,16 +25,16 @@ #define NFCMRVL_NCI_MAX_EVENT_SIZE 260 /* -** NCI FW Parmaters -*/ + * NCI FW Parameters + */ #define NFCMRVL_PB_BAIL_OUT 0x11 #define NFCMRVL_PROP_REF_CLOCK 0xF0 #define NFCMRVL_PROP_SET_HI_CONFIG 0xF1 /* -** HCI defines -*/ + * HCI defines + */ #define NFCMRVL_HCI_EVENT_HEADER_SIZE 0x04 #define NFCMRVL_HCI_EVENT_CODE 0x04 @@ -67,8 +67,8 @@ struct nfcmrvl_private { bool support_fw_dnld; /* - ** PHY related information - */ + * PHY related information + */ /* PHY driver context */ void *drv_data; diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c index d7ba5b5c653c..ed85645eb885 100644 --- a/drivers/nfc/nfcmrvl/uart.c +++ b/drivers/nfc/nfcmrvl/uart.c @@ -18,8 +18,8 @@ static unsigned int break_control; static int reset_n_io = -EINVAL; /* -** NFCMRVL NCI OPS -*/ + * NFCMRVL NCI OPS + */ static int nfcmrvl_uart_nci_open(struct nfcmrvl_private *priv) { @@ -92,8 +92,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node, } /* -** NCI UART OPS -*/ + * NCI UART OPS + */ static int nfcmrvl_nci_uart_open(struct nci_uart *nu) { @@ -167,10 +167,10 @@ static void nfcmrvl_nci_uart_tx_done(struct nci_uart *nu) return; /* - ** To ensure that if the NFCC goes in DEEP SLEEP sate we can wake him - ** up. we set BREAK. Once we will be ready to send again we will remove - ** it. - */ + * To ensure that if the NFCC goes in DEEP SLEEP sate we can wake him + * up. we set BREAK. Once we will be ready to send again we will remove + * it. + */ if (priv->config.break_control && nu->tty->ops->break_ctl) { nu->tty->ops->break_ctl(nu->tty, -1); usleep_range(1000, 3000); From patchwork Mon May 31 07:38:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 451891 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=-16.8 required=3.0 tests=BAYES_00, 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 1D9DDC47082 for ; Mon, 31 May 2021 07:39:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F315260C3F for ; Mon, 31 May 2021 07:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230288AbhEaHkx (ORCPT ); Mon, 31 May 2021 03:40:53 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60606 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230091AbhEaHku (ORCPT ); Mon, 31 May 2021 03:40:50 -0400 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncVy-00036X-PT for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:10 +0000 Received: by mail-wm1-f72.google.com with SMTP id 13-20020a05600c228db029019a69dab6easo418688wmf.0 for ; Mon, 31 May 2021 00:39:10 -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=kOll6TKQbDWTse8M6wamAPtyvMVGYz69R1ORjx1lV/0=; b=tA1n0yViS2KMTsrarhUeekENNNbQnPhCUX23+Hc2nguekbt2Uzx4Fov5lrfwcQY6up J6Mz+C35oaEadC5HggQVIpIDTVuTnag7FPANFHIpj1cMPM0S4XpjDTOxnywMfj+zuyww 3aE309gFRydjsBmCBvGPGedasS+eh7SQPTSxxg071iv1pFMETVhZsruGZ+UzNOqS0jHq NWul5fG0uh6XUV8NJTegxUKSt60Yd1febHmz8jM6nHfBf3kyKnXvfmZFFYFt9dXEXU8i MsF8nsZ2Md7E2Xr5X1GlrG0qop456bAfDFDBavK3gBNs0dNwbe/6vUm/O5riBNrF65ez FANQ== X-Gm-Message-State: AOAM5323LTWBM0HWWd6KsV75eNzEaUDUfs8bbIPVDB51kBS0y9bgYWts o1+xvlcKueXw9exBLTUEMjqung8fKgnwKzZ7au3PKHFpAll9BKCys+cyNFrJbOhoewgeVCNk6nk XqXXHLRUL+29kgBX/oXyHiFgHhjjqYI3/Jg== X-Received: by 2002:a05:600c:2059:: with SMTP id p25mr4703726wmg.56.1622446750584; Mon, 31 May 2021 00:39:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsIR56tR1+XGrfQapnZONUGR+r+w7KQN84keiQfNaaA1hDubeRB9qINkqZRXhWIEB3B3hmNA== X-Received: by 2002:a05:600c:2059:: with SMTP id p25mr4703716wmg.56.1622446750484; Mon, 31 May 2021 00:39:10 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:09 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 05/11] nfc: mrvl: simplify with module_driver Date: Mon, 31 May 2021 09:38:56 +0200 Message-Id: <20210531073902.7111-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove standard module init/exit boilerplate with module_driver() which also annotates the functions with __init. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/nfcmrvl/uart.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c index ed85645eb885..50d86c90b9dd 100644 --- a/drivers/nfc/nfcmrvl/uart.c +++ b/drivers/nfc/nfcmrvl/uart.c @@ -189,23 +189,7 @@ static struct nci_uart nfcmrvl_nci_uart = { .tx_done = nfcmrvl_nci_uart_tx_done, } }; - -/* -** Module init -*/ - -static int nfcmrvl_uart_init_module(void) -{ - return nci_uart_register(&nfcmrvl_nci_uart); -} - -static void nfcmrvl_uart_exit_module(void) -{ - nci_uart_unregister(&nfcmrvl_nci_uart); -} - -module_init(nfcmrvl_uart_init_module); -module_exit(nfcmrvl_uart_exit_module); +module_driver(nfcmrvl_nci_uart, nci_uart_register, nci_uart_unregister); MODULE_AUTHOR("Marvell International Ltd."); MODULE_DESCRIPTION("Marvell NFC-over-UART"); From patchwork Mon May 31 07:38:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 450754 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=-16.8 required=3.0 tests=BAYES_00, 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 54236C47094 for ; Mon, 31 May 2021 07:39:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E33460C3F for ; Mon, 31 May 2021 07:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbhEaHlE (ORCPT ); Mon, 31 May 2021 03:41:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60615 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230325AbhEaHk4 (ORCPT ); Mon, 31 May 2021 03:40:56 -0400 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncW4-00037Q-GD for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:16 +0000 Received: by mail-wm1-f72.google.com with SMTP id x20-20020a1c7c140000b029018f49a7efb7so4435820wmc.1 for ; Mon, 31 May 2021 00:39:16 -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=YZNBNLLuM7Y420WwKOJBdrZZvuC/Ic8dNT+7222oonE=; b=Uq2j+LR3mIs7OG8Ro0BblnWqUGbrvuYR4SpbDsWfrgTTal2NbkzmUGRMeSq4QZFkXG JGEHcPu/faC4ibWu6TTrfKsUWU4d9ehwSsa6BirF3ga2oZYN1aOOJK4swbqXyyGXmRYi r569r4pIvVdAChaXxs4GVY+zZy1vfMDP2q0WVt97XM3LLV38F+mxFPLtkx8xBgyInXvu 8tNzQwf2aiTElJVghLQiQiChv6a5Wr1VkYiWulL8YE+NTODpVmZad0GbNkHCAKXg+EO4 zhDnqdJPcTfWMYSZtHouzrUk0B/nPpKP4IFTHZJ4QSDKfWTSS53W9eWHdGK/R4O3/yJq kMjA== X-Gm-Message-State: AOAM5326lx5IesMgX/xOK1ZR3hwO6TXtXCX1e3SZPnheShELPoyfLDmU vYh2bY47/NI8QhWVRJvmBFJDzbZe/WxufuvVj8fHy8jULUSZJebw+02EiE6vlz1GsZ20Hgm/5yo Z/Xis1aJFFjxY32CBx4/5te6AChRlvluaaA== X-Received: by 2002:a5d:50c7:: with SMTP id f7mr21254528wrt.189.1622446756159; Mon, 31 May 2021 00:39:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnFcoMnrJnMBkjW5xup7s16dMzXQ/Yiluqq5JY19k+TOj/ag6ZcdukR/bpD673OLg4e1bM5Q== X-Received: by 2002:a5d:50c7:: with SMTP id f7mr21254511wrt.189.1622446755950; Mon, 31 May 2021 00:39:15 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:15 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 06/11] nfc: pn533: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:38:57 +0200 Message-Id: <20210531073902.7111-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn533/i2c.c | 5 ----- drivers/nfc/pn533/pn533.c | 46 --------------------------------------- drivers/nfc/pn533/usb.c | 4 ---- 3 files changed, 55 deletions(-) diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index bfc617acabae..bb04fddb0504 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -174,9 +174,6 @@ static int pn533_i2c_probe(struct i2c_client *client, struct pn533 *priv; int r = 0; - dev_dbg(&client->dev, "%s\n", __func__); - dev_dbg(&client->dev, "IRQ: %d\n", client->irq); - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { nfc_err(&client->dev, "Need I2C_FUNC_I2C\n"); return -ENODEV; @@ -239,8 +236,6 @@ static int pn533_i2c_remove(struct i2c_client *client) { struct pn533_i2c_phy *phy = i2c_get_clientdata(client); - dev_dbg(&client->dev, "%s\n", __func__); - free_irq(client->irq, phy); pn53x_unregister_nfc(phy->priv); diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index 2c7f9916f206..cd64bfe20402 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -1075,8 +1075,6 @@ static int pn533_tm_get_data_complete(struct pn533 *dev, void *arg, u8 status, ret, mi; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) { skb_queue_purge(&dev->resp_q); return PTR_ERR(resp); @@ -1124,8 +1122,6 @@ static void pn533_wq_tm_mi_recv(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, 0); if (!skb) return; @@ -1148,8 +1144,6 @@ static void pn533_wq_tm_mi_send(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - /* Grab the first skb in the queue */ skb = skb_dequeue(&dev->fragment_skb); if (skb == NULL) { /* No more data */ @@ -1186,8 +1180,6 @@ static void pn533_wq_tg_get_data(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, 0); if (!skb) return; @@ -1206,8 +1198,6 @@ static int pn533_init_target_complete(struct pn533 *dev, struct sk_buff *resp) size_t gb_len; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - if (resp->len < ATR_REQ_GB_OFFSET + 1) return -EINVAL; @@ -1260,8 +1250,6 @@ static int pn533_rf_complete(struct pn533 *dev, void *arg, { int rc = 0; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) { rc = PTR_ERR(resp); @@ -1283,8 +1271,6 @@ static void pn533_wq_rf(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, 2); if (!skb) return; @@ -1360,8 +1346,6 @@ static int pn533_poll_dep(struct nfc_dev *nfc_dev) u8 *next, nfcid3[NFC_NFCID3_MAXSIZE]; u8 passive_data[PASSIVE_DATA_LEN] = {0x00, 0xff, 0xff, 0x00, 0x3}; - dev_dbg(dev->dev, "%s", __func__); - if (!dev->gb) { dev->gb = nfc_get_local_general_bytes(nfc_dev, &dev->gb_len); @@ -1511,8 +1495,6 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg, struct pn533_poll_modulations *cur_mod; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) { rc = PTR_ERR(resp); @@ -1783,8 +1765,6 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev) struct sk_buff *skb; struct sk_buff *resp; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, sizeof(u8) * 2); /*TG + Next*/ if (!skb) return -ENOMEM; @@ -1866,8 +1846,6 @@ static int pn533_deactivate_target_complete(struct pn533 *dev, void *arg, { int rc = 0; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) { rc = PTR_ERR(resp); @@ -1892,8 +1870,6 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev, struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - if (!dev->tgt_active_prot) { nfc_err(dev->dev, "There is no active target\n"); return; @@ -1988,8 +1964,6 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, u8 *next, *arg, nfcid3[NFC_NFCID3_MAXSIZE]; u8 passive_data[PASSIVE_DATA_LEN] = {0x00, 0xff, 0xff, 0x00, 0x3}; - dev_dbg(dev->dev, "%s\n", __func__); - if (dev->poll_mod_count) { nfc_err(dev->dev, "Cannot bring the DEP link up while polling\n"); @@ -2067,8 +2041,6 @@ static int pn533_dep_link_down(struct nfc_dev *nfc_dev) { struct pn533 *dev = nfc_get_drvdata(nfc_dev); - dev_dbg(dev->dev, "%s\n", __func__); - pn533_poll_reset_mod_list(dev); if (dev->tgt_mode || dev->tgt_active_prot) @@ -2092,8 +2064,6 @@ static struct sk_buff *pn533_build_response(struct pn533 *dev) struct sk_buff *skb, *tmp, *t; unsigned int skb_len = 0, tmp_len = 0; - dev_dbg(dev->dev, "%s\n", __func__); - if (skb_queue_empty(&dev->resp_q)) return NULL; @@ -2133,8 +2103,6 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg, int rc = 0; u8 status, ret, mi; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) { rc = PTR_ERR(resp); goto _error; @@ -2288,8 +2256,6 @@ static int pn533_transceive(struct nfc_dev *nfc_dev, struct pn533_data_exchange_arg *arg = NULL; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - if (!dev->tgt_active_prot) { nfc_err(dev->dev, "Can't exchange data if there is no active target\n"); @@ -2356,8 +2322,6 @@ static int pn533_tm_send_complete(struct pn533 *dev, void *arg, { u8 status; - dev_dbg(dev->dev, "%s\n", __func__); - if (IS_ERR(resp)) return PTR_ERR(resp); @@ -2388,8 +2352,6 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) struct pn533 *dev = nfc_get_drvdata(nfc_dev); int rc; - dev_dbg(dev->dev, "%s\n", __func__); - /* let's split in multiple chunks if size's too big */ if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) { rc = pn533_fill_fragment_skbs(dev, skb); @@ -2426,8 +2388,6 @@ static void pn533_wq_mi_recv(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, PN533_CMD_DATAEXCH_HEAD_LEN); if (!skb) goto error; @@ -2476,8 +2436,6 @@ static void pn533_wq_mi_send(struct work_struct *work) struct sk_buff *skb; int rc; - dev_dbg(dev->dev, "%s\n", __func__); - /* Grab the first skb in the queue */ skb = skb_dequeue(&dev->fragment_skb); @@ -2533,8 +2491,6 @@ static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata, struct sk_buff *resp; int skb_len; - dev_dbg(dev->dev, "%s\n", __func__); - skb_len = sizeof(cfgitem) + cfgdata_len; /* cfgitem + cfgdata */ skb = pn533_alloc_skb(dev, skb_len); @@ -2580,8 +2536,6 @@ static int pn533_pasori_fw_reset(struct pn533 *dev) struct sk_buff *skb; struct sk_buff *resp; - dev_dbg(dev->dev, "%s\n", __func__); - skb = pn533_alloc_skb(dev, sizeof(u8)); if (!skb) return -ENOMEM; diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index 84d2bfabf42b..bd7f7478d189 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -354,8 +354,6 @@ static void pn533_acr122_poweron_rdr_resp(struct urb *urb) { struct pn533_acr122_poweron_rdr_arg *arg = urb->context; - dev_dbg(&urb->dev->dev, "%s\n", __func__); - print_hex_dump_debug("ACR122 RX: ", DUMP_PREFIX_NONE, 16, 1, urb->transfer_buffer, urb->transfer_buffer_length, false); @@ -375,8 +373,6 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) void *cntx; struct pn533_acr122_poweron_rdr_arg arg; - dev_dbg(&phy->udev->dev, "%s\n", __func__); - buffer = kmemdup(cmd, sizeof(cmd), GFP_KERNEL); if (!buffer) return -ENOMEM; From patchwork Mon May 31 07:38:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 451890 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=-16.8 required=3.0 tests=BAYES_00, 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 A798AC47082 for ; Mon, 31 May 2021 07:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 893CE60C3F for ; Mon, 31 May 2021 07:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230107AbhEaHlO (ORCPT ); Mon, 31 May 2021 03:41:14 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60619 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230340AbhEaHlA (ORCPT ); Mon, 31 May 2021 03:41:00 -0400 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncW8-000386-Le for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:20 +0000 Received: by mail-wm1-f71.google.com with SMTP id o23-20020a1c4d170000b02901988447856bso2063030wmh.0 for ; Mon, 31 May 2021 00:39:20 -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=rqhoxm5CLlbJM/5GAddet7UbrdiBVjWGcbVsawnnnn4=; b=aYDlTOXgpQOWQmyD4UEBBTuZMVRk0f3HkDCCB+fdLe0derufBa9HatDOqVZd7ar3jb HwURxLcHiqQJBvccS9kuA7k9Cahy2MA8Wx1LYZeT2SCJ4fZ1rz18skg/rI6U2+ZkB8XL kkv3wv6VFt5EO4yz7rLaHnBAy1bz1gfgL4ozjbyzXSxaYUXadsirE2NTEDhp90smU1C6 BoyBfu1HyC+q6lwk3PJa/kReHgYExhQZtQdtzXUBkZP6wugt21aSBtoKEiVcZbJzDcLs BxXIHTNh7DARgIfbYfs/XQN1TmUcFJhX4WYK36DMIs0ihWR11N+Bl4MsN0ItE0MPTIvp AYOw== X-Gm-Message-State: AOAM5306Rdl2KjgMElvyV3jdrZOsCO8Q/TQZWmaDp4AA+nA7XUQplAZ6 pBZupIH1hbmp1kwYPya1UIn5YxW0dRuTfYDoh+4FMyFBkPTM901SVJx/jaX1P110YR8vZIZdAAx xcOcJYsBnxTnd3jJbqgT6X7SeXFDVCy8IqQ== X-Received: by 2002:a1c:4304:: with SMTP id q4mr4723193wma.89.1622446760489; Mon, 31 May 2021 00:39:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3sisp3Wo09P8lmTnXy6HbSldTGXnsq3kSNvNn0N2+ZhFPrlfzfkHfeYDOg39Tl+QlYG3WJQ== X-Received: by 2002:a1c:4304:: with SMTP id q4mr4723180wma.89.1622446760345; Mon, 31 May 2021 00:39:20 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:20 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 07/11] nfc: pn533: drop unneeded braces {} in if Date: Mon, 31 May 2021 09:38:58 +0200 Message-Id: <20210531073902.7111-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org {} braces are not needed over single if-statement. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn533/i2c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index bb04fddb0504..e6bf8cfe3aa7 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -192,9 +192,8 @@ static int pn533_i2c_probe(struct i2c_client *client, phy, &i2c_phy_ops, NULL, &phy->i2c_dev->dev); - if (IS_ERR(priv)) { + if (IS_ERR(priv)) return PTR_ERR(priv); - } phy->priv = priv; r = pn532_i2c_nfc_alloc(priv, PN533_NO_TYPE_B_PROTOCOLS, &client->dev); From patchwork Mon May 31 07:38:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 451888 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=-16.8 required=3.0 tests=BAYES_00, 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 7964AC4708F for ; Mon, 31 May 2021 07:40:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E24961220 for ; Mon, 31 May 2021 07:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231132AbhEaHlj (ORCPT ); Mon, 31 May 2021 03:41:39 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60630 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbhEaHlE (ORCPT ); Mon, 31 May 2021 03:41:04 -0400 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncW9-00038p-Rq for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:21 +0000 Received: by mail-wr1-f69.google.com with SMTP id u5-20020adf9e050000b029010df603f280so3615374wre.18 for ; Mon, 31 May 2021 00:39:21 -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=j+dadvxhKr9M8DJyOltCeC2IGkgvG/BUqwA8QIFSNMA=; b=Pbz5N8xUIJfKYg3EB7MVU25fS18htAM8ybrZD4DMWelcJQfZay/T47Sf7kNihQp3N+ X3j5AQBqRUTXvqdHPrvzRClEzhg9KBvIQWBAu663eFxEvfeGNp5ZueMEXd4hxm+4SWcO ujVEJf3V0q0QVGzQkcjXEG7HLlrO+1ZzKu8hBqvaSymnMPdQHyUEPxdMXLkEDnp0Bn7s ghE8FTDyb6SF05ZURkp6shtvz9iIp52D6KjGm+p4eHcpMRtjedgQtoR60ChOR+ZMcv5X uEOAsu9psM+JM7vOcZRUPYi4Ij+O79fu/CxYow2vJU5knl7Ctw4e8QYsr9YR/YX8YuAl 1Zxg== X-Gm-Message-State: AOAM533vhmRQ7DxrD14EpynDmQkV9QVFc1WY4Ay9Wku5l0d903aLRwId qfGiyW5C6d4h1CJLLxQ0TBVBojtOneObWf//LkYkkYdXfJtKOL1PbGycUZZtrs3FYOl/a6sSa6G N1oXBbDNUYQP2jc6QR7UFq+LFzZ+vVvHsVw== X-Received: by 2002:a7b:cf23:: with SMTP id m3mr25335316wmg.24.1622446761286; Mon, 31 May 2021 00:39:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzb6o1VPKOFpplOXi79XWh6sSwmdcjRCTi34hGnidyYynLUfs94/VRLJuSItxs2w47msn94Yg== X-Received: by 2002:a7b:cf23:: with SMTP id m3mr25335309wmg.24.1622446761179; Mon, 31 May 2021 00:39:21 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:20 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 08/11] nfc: pn544: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:38:59 +0200 Message-Id: <20210531073902.7111-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/pn544/i2c.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index aac778c5ddd2..de59e439c369 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -241,8 +241,6 @@ static int pn544_hci_i2c_enable(void *phy_id) { struct pn544_i2c_phy *phy = phy_id; - pr_info("%s\n", __func__); - pn544_hci_i2c_enable_mode(phy, PN544_HCI_MODE); phy->powered = 1; @@ -875,9 +873,6 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, struct pn544_i2c_phy *phy; int r = 0; - dev_dbg(&client->dev, "%s\n", __func__); - dev_dbg(&client->dev, "IRQ: %d\n", client->irq); - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { nfc_err(&client->dev, "Need I2C_FUNC_I2C\n"); return -ENODEV; @@ -937,8 +932,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client) { struct pn544_i2c_phy *phy = i2c_get_clientdata(client); - dev_dbg(&client->dev, "%s\n", __func__); - cancel_work_sync(&phy->fw_work); if (phy->fw_work_state != FW_WORK_STATE_IDLE) pn544_hci_i2c_fw_work_complete(phy, -ENODEV); From patchwork Mon May 31 07:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 450752 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=-16.8 required=3.0 tests=BAYES_00, 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 7D5ECC47082 for ; Mon, 31 May 2021 07:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60C3660C3F for ; Mon, 31 May 2021 07:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230389AbhEaHla (ORCPT ); Mon, 31 May 2021 03:41:30 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60632 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbhEaHlE (ORCPT ); Mon, 31 May 2021 03:41:04 -0400 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncWA-000393-Fz for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:22 +0000 Received: by mail-wm1-f69.google.com with SMTP id n127-20020a1c27850000b02901717a27c785so4432576wmn.9 for ; Mon, 31 May 2021 00:39:22 -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=4J89KlzzqThKgmZLnM37DvaB3SqI47fv9hR1FCtpA64=; b=CWGzRoraSjYPRTp+pwWTVgMYBObiyblCF6EevM39TfrQOf6aUrPC+fVktnIhFiRtsp h/aywP/3oWyaxd4j05AmE7ikOVTNki4ryEoo2Gn6kdRrZlqyzkq+M10ZJaleg4NAI5sD /S681r6dJ87+iggJLIEiKq/Q8MggiERBu5FJo/QN+kVM9x0azQLfMmsY/I3rJJ55co4Y w/YrciKVfPJ3fsBUkJitzAbrBaEJtCVNw2HTk8wiOPOLHT16xVICqBCvR+ceKyvQ2ZoV M/ZdG0TRZvLJkmQF+d0XnRkFzXHXRSDQq+lPZaEm9+fH6DrnZIl3dw6npjjUhjcYMyFK sTmw== X-Gm-Message-State: AOAM530DoTv2uq6tnFb6YXAYRNhUrS856NXOTXHNSuqMJM35tRD/Y5F5 u4vRkNWnuolbQd1kbfZi1syF7aWTx7eErqZSMrVfig4/XMGLPay0Btq5Eza6mWlIcuTliAgMe1Z 09XSt22ZH0++EKWp35qNaDBu13dQNw214Bg== X-Received: by 2002:a05:600c:2948:: with SMTP id n8mr24706750wmd.95.1622446762291; Mon, 31 May 2021 00:39:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoc0eYdm0Gad3jKfILWO0BlkrBHmb4+ihv28lP2KSvG+Az7qWFv7kizSOlAt+HwZQaPXWCeQ== X-Received: by 2002:a05:600c:2948:: with SMTP id n8mr24706734wmd.95.1622446762165; Mon, 31 May 2021 00:39:22 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:21 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 09/11] nfc: st21nfca: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:39:00 +0200 Message-Id: <20210531073902.7111-5-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/st21nfca/i2c.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index cebc6c06a1b6..7a9f4d71707e 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -502,9 +502,6 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client, struct st21nfca_i2c_phy *phy; int r; - dev_dbg(&client->dev, "%s\n", __func__); - dev_dbg(&client->dev, "IRQ: %d\n", client->irq); - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { nfc_err(&client->dev, "Need I2C_FUNC_I2C\n"); return -ENODEV; @@ -568,8 +565,6 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client) { struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client); - dev_dbg(&client->dev, "%s\n", __func__); - st21nfca_hci_remove(phy->hdev); if (phy->powered) From patchwork Mon May 31 07:39:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 450751 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=-16.8 required=3.0 tests=BAYES_00, 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 7840BC4708F for ; Mon, 31 May 2021 07:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5EDC661248 for ; Mon, 31 May 2021 07:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbhEaHlp (ORCPT ); Mon, 31 May 2021 03:41:45 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60640 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230345AbhEaHlE (ORCPT ); Mon, 31 May 2021 03:41:04 -0400 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncWC-00039w-8K for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:24 +0000 Received: by mail-wm1-f70.google.com with SMTP id w3-20020a1cf6030000b0290195fd5fd0f2so2870573wmc.4 for ; Mon, 31 May 2021 00:39: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=g1FAyvgyu/qVXx6L5siomBosL8eH4sVo53XTzJaTdO0=; b=G+bKR4nn1QujcEeG0QV6eQpLcr7k3ubNlsdUFVOgQirE0ILCE4ZXsS2dd113LtQ9as mD62lBT7hqQXf0XaDV6jsZZImz3ObyZFPtHNwI/zkvFrcSEJYw0HLFQ4zzOr5H6IlKHw Vaeecs2ZdS6NB8dSFQBW1/iggRtc7lGzsLp8J2slvPrHwWdf/VkkFbOB+uVEiSLGTXix MBMPIppB4b6sbdKoHNrXjXH0dGAbblB5Rbl7AWXRsGKJN8PB8xEySsJ7wVZLrC85LZgd He5SlOM97DvgTAOU66phTef469YSfcxf93sXuK51E+UL951hXYFL3tX3LcNd/LoGRUAT fWVQ== X-Gm-Message-State: AOAM531Z7QtSZDv7vFyuq2hZZVP3yE9r9wT5e2jqQumeRPBk9sZGVfvW JVCz2eOG8JLrbaFmJ8GGCn/bna7Gr8eUNELfdORGg8HLAWVYtnH+fi0i7uJhsiskyqbqZT0RcAs U95RTw7znZkKGeYyh0G4KGo3rfbux9FokLQ== X-Received: by 2002:a05:600c:231a:: with SMTP id 26mr13555907wmo.92.1622446763251; Mon, 31 May 2021 00:39:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsV8autLYEr9eV5Wyus99mhUBr9uj33Y8pykWfReCEKmHjnGozrIsUQTth2S6tBaa77HTFEQ== X-Received: by 2002:a05:600c:231a:: with SMTP id 26mr13555897wmo.92.1622446763135; Mon, 31 May 2021 00:39:23 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:22 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 10/11] nfc: st-nci: drop ftrace-like debugging messages Date: Mon, 31 May 2021 09:39:01 +0200 Message-Id: <20210531073902.7111-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the kernel has ftrace, any debugging calls that just do "made it to this function!" and "leaving this function!" can be removed. Better to use standard debugging tools. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/st-nci/i2c.c | 5 ----- drivers/nfc/st-nci/se.c | 6 ------ drivers/nfc/st-nci/spi.c | 5 ----- 3 files changed, 16 deletions(-) diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index 663d1cc19b81..46981405e8b1 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -206,9 +206,6 @@ static int st_nci_i2c_probe(struct i2c_client *client, struct st_nci_i2c_phy *phy; int r; - dev_dbg(&client->dev, "%s\n", __func__); - dev_dbg(&client->dev, "IRQ: %d\n", client->irq); - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { nfc_err(&client->dev, "Need I2C_FUNC_I2C\n"); return -ENODEV; @@ -261,8 +258,6 @@ static int st_nci_i2c_remove(struct i2c_client *client) { struct st_nci_i2c_phy *phy = i2c_get_clientdata(client); - dev_dbg(&client->dev, "%s\n", __func__); - ndlc_remove(phy->ndlc); return 0; diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 8657e025166f..5fd89f72969d 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -470,8 +470,6 @@ int st_nci_disable_se(struct nci_dev *ndev, u32 se_idx) { int r; - pr_debug("st_nci_disable_se\n"); - /* * According to upper layer, se_idx == NFC_SE_UICC when * info->se_info.se_status->is_uicc_enable is true should never happen @@ -496,8 +494,6 @@ int st_nci_enable_se(struct nci_dev *ndev, u32 se_idx) { int r; - pr_debug("st_nci_enable_se\n"); - /* * According to upper layer, se_idx == NFC_SE_UICC when * info->se_info.se_status->is_uicc_enable is true should never happen. @@ -602,8 +598,6 @@ int st_nci_discover_se(struct nci_dev *ndev) int se_count = 0; struct st_nci_info *info = nci_get_drvdata(ndev); - pr_debug("st_nci_discover_se\n"); - r = st_nci_hci_network_init(ndev); if (r != 0) return r; diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c index 5f1a2173b2e7..250d56f204c3 100644 --- a/drivers/nfc/st-nci/spi.c +++ b/drivers/nfc/st-nci/spi.c @@ -216,9 +216,6 @@ static int st_nci_spi_probe(struct spi_device *dev) struct st_nci_spi_phy *phy; int r; - dev_dbg(&dev->dev, "%s\n", __func__); - dev_dbg(&dev->dev, "IRQ: %d\n", dev->irq); - /* Check SPI platform functionnalities */ if (!dev) { pr_debug("%s: dev is NULL. Device is not accessible.\n", @@ -274,8 +271,6 @@ static int st_nci_spi_remove(struct spi_device *dev) { struct st_nci_spi_phy *phy = spi_get_drvdata(dev); - dev_dbg(&dev->dev, "%s\n", __func__); - ndlc_remove(phy->ndlc); return 0; From patchwork Mon May 31 07:39:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 451887 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=-16.8 required=3.0 tests=BAYES_00, 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 68122C47082 for ; Mon, 31 May 2021 07:40:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BDF061220 for ; Mon, 31 May 2021 07:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231187AbhEaHls (ORCPT ); Mon, 31 May 2021 03:41:48 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60647 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230343AbhEaHlF (ORCPT ); Mon, 31 May 2021 03:41:05 -0400 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lncWD-0003AU-1J for netdev@vger.kernel.org; Mon, 31 May 2021 07:39:25 +0000 Received: by mail-wm1-f72.google.com with SMTP id l18-20020a05600c4f12b02901921c0f2098so3893744wmq.0 for ; Mon, 31 May 2021 00:39:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=edJlbbhDO28RmalfYtPxF+agVQnBc9uKOzw55MZRkiU=; b=CEctU7IdeITH81E7QuelXTi990J+zHBcK/UHwZDeFpQsrz5wstoeLw1oLDP1pR2DGs zrnV5HVzawbsqqVXdqW4Byyu40oVz+iLVU3NokUrDTpqcs735OIrkpw/NA0UYmgyH+pR XI57QEtPLMnhwnf3d09ig3tlI1cQ1gLXKI2AZJJXcQKeBMmI17tIkXmUirDDD60ZKA6g 6gUTn8FNbMM1q2+KXdxW1NvfW8Q8xrMSEqORIeFsipA6RKvwt+zb1mcMHTNy3ODHYKyS +mcaeKrrP1H3afzshW+tEPTHHd4kCMNl6CDKnwsH1beZAoq1+XC2nsElOBjzpTmIyV/h vjRg== X-Gm-Message-State: AOAM533gWLm8oao52KDHhIny4m+OSL0n5Wu3ErxpxcFeEJCCtwt3Sik6 b3Ysu/NHFIP7z2cK+jE0ICaK3NkICNByloXiXDaibCEnD1nFd8rEOiEprv7yOO5+7f9ZvNEWSpP LaZr7VO7y0POm2e31eBkGURq5CwZbar2EUQ== X-Received: by 2002:adf:e3c8:: with SMTP id k8mr20361124wrm.212.1622446764458; Mon, 31 May 2021 00:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhrRG0xVTTRKmEPbpAveb22Wz/57NL6TRG+5R1+rJ9+T+fewiXUT5mJUt4uwtoCVIYndAGjw== X-Received: by 2002:adf:e3c8:: with SMTP id k8mr20361115wrm.212.1622446764356; Mon, 31 May 2021 00:39:24 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-185-9.adslplus.ch. [188.155.185.9]) by smtp.gmail.com with ESMTPSA id a1sm9168911wrg.92.2021.05.31.00.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 00:39:23 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 11/11] nfc: st95hf: fix indentation to tabs Date: Mon, 31 May 2021 09:39:02 +0200 Message-Id: <20210531073902.7111-7-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> References: <20210531073522.6720-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use tabs to indent instead of spaces. No functional change. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/st95hf/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c index 0d99181b6ce3..2dc788c363fd 100644 --- a/drivers/nfc/st95hf/core.c +++ b/drivers/nfc/st95hf/core.c @@ -1057,8 +1057,8 @@ static const struct spi_device_id st95hf_id[] = { MODULE_DEVICE_TABLE(spi, st95hf_id); static const struct of_device_id st95hf_spi_of_match[] __maybe_unused = { - { .compatible = "st,st95hf" }, - { }, + { .compatible = "st,st95hf" }, + {}, }; MODULE_DEVICE_TABLE(of, st95hf_spi_of_match);