Hi,
This is a rebase and resend of v2. No other changes.
Changes since v1:
1. Remove unused variable in pn533 (reported by kbuild).
Best regards,
Krzysztof
Krzysztof Kozlowski (7):
nfc: drop unneeded debug prints
nfc: nci: replace GPLv2 boilerplate with SPDX
nfc: s3fwrn5: simplify dereferencing pointer to struct device
nfc: st-nci: drop unneeded debug prints
nfc: st21nfca: drop unneeded debug prints
nfc: trf7970a: drop unneeded debug prints
nfc: microread: drop unneeded debug prints
drivers/nfc/microread/i2c.c | 4 ----
drivers/nfc/microread/mei.c | 2 --
drivers/nfc/s3fwrn5/firmware.c | 29 +++++++++++------------------
drivers/nfc/s3fwrn5/nci.c | 18 +++++++-----------
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 ----
drivers/nfc/st21nfca/i2c.c | 4 ----
drivers/nfc/st21nfca/se.c | 4 ----
drivers/nfc/trf7970a.c | 8 --------
net/nfc/hci/command.c | 16 ----------------
net/nfc/hci/llc_shdlc.c | 12 ------------
net/nfc/llcp_commands.c | 8 --------
net/nfc/llcp_core.c | 5 +----
net/nfc/nci/core.c | 4 ----
net/nfc/nci/hci.c | 4 ----
net/nfc/nci/ntf.c | 9 ---------
net/nfc/nci/uart.c | 16 ++--------------
19 files changed, 21 insertions(+), 140 deletions(-)
--
2.30.2
ftrace is a preferred and standard way to debug entering and exiting
functions so drop useless debug prints.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Mark Greer <[email protected]>
---
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);
--
2.30.2
ftrace is a preferred and standard way to debug entering and exiting
functions so drop useless debug prints.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/nfc/microread/i2c.c | 4 ----
drivers/nfc/microread/mei.c | 2 --
2 files changed, 6 deletions(-)
diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c
index 86f593c73ed6..067295124eb9 100644
--- a/drivers/nfc/microread/i2c.c
+++ b/drivers/nfc/microread/i2c.c
@@ -237,8 +237,6 @@ static int microread_i2c_probe(struct i2c_client *client,
struct microread_i2c_phy *phy;
int r;
- dev_dbg(&client->dev, "client %p\n", client);
-
phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy),
GFP_KERNEL);
if (!phy)
@@ -262,8 +260,6 @@ static int microread_i2c_probe(struct i2c_client *client,
if (r < 0)
goto err_irq;
- nfc_info(&client->dev, "Probed\n");
-
return 0;
err_irq:
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 00689e18dc46..e2a77a5fc887 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -23,8 +23,6 @@ static int microread_mei_probe(struct mei_cl_device *cldev,
struct nfc_mei_phy *phy;
int r;
- pr_info("Probing NFC microread\n");
-
phy = nfc_mei_phy_alloc(cldev);
if (!phy)
return -ENOMEM;
--
2.30.2
ftrace is a preferred and standard way to debug entering and exiting
functions so drop useless debug prints.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
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 0875b773fb41..4e723992e74c 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;
--
2.30.2
ftrace is a preferred and standard way to debug entering and exiting
functions so drop useless debug prints.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
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);
--
2.30.2
From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 7 Oct 2021 15:30:14 +0200
> Hi,
>
> This is a rebase and resend of v2. No other changes.
>
> Changes since v1:
> 1. Remove unused variable in pn533 (reported by kbuild).
Please CC: netdev for nfc patches otherwise they will not get tracked
and applied.
Thank you.
On Fri, 8 Oct 2021 at 12:18, Krzysztof Kozlowski
<[email protected]> wrote:
>
> On Fri, 8 Oct 2021 at 12:17, David Miller <[email protected]> wrote:
> >
> > From: Krzysztof Kozlowski <[email protected]>
> > Date: Thu, 7 Oct 2021 15:30:14 +0200
> >
> > > Hi,
> > >
> > > This is a rebase and resend of v2. No other changes.
> > >
> > > Changes since v1:
> > > 1. Remove unused variable in pn533 (reported by kbuild).
> >
> > Please CC: netdev for nfc patches otherwise they will not get tracked
> > and applied.
>
> [email protected] is here. Which address I missed?
The patchset reached patchwork:
https://patchwork.kernel.org/project/netdevbpf/list/?series=559153&state=*
although for some reason it is marked as "changes requested". Are
there any other changes needed except Joe's comment for one patch?
Best regards,
Krzysztof
On Sun, 10 Oct 2021 13:36:59 +0200 Krzysztof Kozlowski wrote:
> On Fri, 8 Oct 2021 at 12:18, Krzysztof Kozlowski wrote:
> > On Fri, 8 Oct 2021 at 12:17, David Miller <[email protected]> wrote:
> > > Please CC: netdev for nfc patches otherwise they will not get tracked
> > > and applied.
> >
> > [email protected] is here. Which address I missed?
>
> The patchset reached patchwork:
> https://patchwork.kernel.org/project/netdevbpf/list/?series=559153&state=*
> although for some reason it is marked as "changes requested". Are
> there any other changes needed except Joe's comment for one patch?
I think it was just Joe's comment, nothing else here looks
objectionable.
On 11/10/2021 15:03, Jakub Kicinski wrote:
> On Sun, 10 Oct 2021 13:36:59 +0200 Krzysztof Kozlowski wrote:
>> On Fri, 8 Oct 2021 at 12:18, Krzysztof Kozlowski wrote:
>>> On Fri, 8 Oct 2021 at 12:17, David Miller <[email protected]> wrote:
>>>> Please CC: netdev for nfc patches otherwise they will not get tracked
>>>> and applied.
>>>
>>> [email protected] is here. Which address I missed?
>>
>> The patchset reached patchwork:
>> https://patchwork.kernel.org/project/netdevbpf/list/?series=559153&state=*
>> although for some reason it is marked as "changes requested". Are
>> there any other changes needed except Joe's comment for one patch?
>
> I think it was just Joe's comment, nothing else here looks
> objectionable.
>
OK, I'll send a v3 with fixed SPDX.
Best regards,
Krzysztof