2018-07-20 18:25:39

by Colin King

Subject: [PATCH] nfc: st95hf: remove redundant pointers 'dev' and 'nfcddev'

From: Colin Ian King <[email protected]>

Pointers 'dev' and 'nfcddev' are being assigned but are never used
hence they are redundant and can be removed.

Cleans up clang warnings:
warning: variable 'dev' set but not used [-Wunused-but-set-variable]
warning: variable 'nfcddev' set but not used [-Wunused-but-set-variable]

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/nfc/st95hf/core.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
index a50a95cfcfd8..36ef0e905ba3 100644
--- a/drivers/nfc/st95hf/core.c
+++ b/drivers/nfc/st95hf/core.c
@@ -781,9 +781,7 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
int result = 0;
int res_len;
static bool wtx;
- struct device *dev;
struct device *spidevice;
- struct nfc_digital_dev *nfcddev;
struct sk_buff *skb_resp;
struct st95hf_context *stcontext =
(struct st95hf_context *)st95hfcontext;
@@ -828,8 +826,6 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
goto end;
}

- dev = &stcontext->nfcdev->dev;
- nfcddev = stcontext->ddev;
if (skb_resp->data[2] == WTX_REQ_FROM_TAG) {
/* Request for new FWT from tag */
result = st95hf_handle_wtx(stcontext, true, skb_resp->data[3]);
--
2.17.1

2018-07-21 09:56:26

by Daniel Mack

Subject: Re: [PATCH] nfc: st95hf: remove redundant pointers 'dev' and 'nfcddev'

On Friday, July 20, 2018 08:24 PM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Pointers 'dev' and 'nfcddev' are being assigned but are never used
> hence they are redundant and can be removed.
>
> Cleans up clang warnings:
> warning: variable 'dev' set but not used [-Wunused-but-set-variable]
> warning: variable 'nfcddev' set but not used [-Wunused-but-set-variable]
>
> Signed-off-by: Colin Ian King <[email protected]>

This seems correct.

I am currently working on a bigger series of patches for this driver
that also touches code in the same area. I plan to post the series next
week. If this patch is applied until then, I can rebase my changes upon
it before sending.


Thanks,
Daniel





> ---
> drivers/nfc/st95hf/core.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
> index a50a95cfcfd8..36ef0e905ba3 100644
> --- a/drivers/nfc/st95hf/core.c
> +++ b/drivers/nfc/st95hf/core.c
> @@ -781,9 +781,7 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
> int result = 0;
> int res_len;
> static bool wtx;
> - struct device *dev;
> struct device *spidevice;
> - struct nfc_digital_dev *nfcddev;
> struct sk_buff *skb_resp;
> struct st95hf_context *stcontext =
> (struct st95hf_context *)st95hfcontext;
> @@ -828,8 +826,6 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
> goto end;
> }
>
> - dev = &stcontext->nfcdev->dev;
> - nfcddev = stcontext->ddev;
> if (skb_resp->data[2] == WTX_REQ_FROM_TAG) {
> /* Request for new FWT from tag */
> result = st95hf_handle_wtx(stcontext, true, skb_resp->data[3]);
>