2015-12-22 09:54:24

by Shikha SINGH

Subject: [[linux-nfc] PATCH v1.0 0/1] ST95HF:Fix build err

Modification in st95hf/core.c to resolve build error.
Patch contains only delta in core.c to fix build error
assuming original series of ST95HF driver is already
applied on NFC-next master branch.

Shikha Singh (1):
driver: nfc: st95hf: Fix of build error

drivers/nfc/st95hf/core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

--
1.8.2.1

2015-12-22 09:54:24

by Shikha SINGH

Subject: [[linux-nfc] PATCH v1.0 1/1] driver: nfc: st95hf: Fix of build error

Modification in core.c to rename function "irq_handler"
and "irq_thread_handler" to "st95hf_irq_handler" and
"st95hf_irq_thread_handler" respectively. This modification
was done to remove build error.

Signed-off-by: Shikha Singh <[email protected]>
---
drivers/nfc/st95hf/core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
index 526e342..9524b12 100644
--- a/drivers/nfc/st95hf/core.c
+++ b/drivers/nfc/st95hf/core.c
@@ -762,7 +762,7 @@ static int st95hf_response_handler(struct st95hf_context *stcontext,
return result;
}

-static irqreturn_t irq_handler(int irq, void *st95hfcontext)
+static irqreturn_t st95hf_irq_handler(int irq, void *st95hfcontext)
{
struct st95hf_context *stcontext =
(struct st95hf_context *)st95hfcontext;
@@ -776,7 +776,7 @@ static irqreturn_t irq_handler(int irq, void *st95hfcontext)
return IRQ_WAKE_THREAD;
}

-static irqreturn_t irq_thread_handler(int irq, void *st95hfcontext)
+static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
{
int result = 0;
int res_len;
@@ -1140,8 +1140,8 @@ static int st95hf_probe(struct spi_device *nfc_spi_dev)
if (nfc_spi_dev->irq > 0) {
if (devm_request_threaded_irq(&nfc_spi_dev->dev,
nfc_spi_dev->irq,
- irq_handler,
- irq_thread_handler,
+ st95hf_irq_handler,
+ st95hf_irq_thread_handler,
IRQF_TRIGGER_FALLING,
"st95hf",
(void *)st95context) < 0) {
--
1.8.2.1

2015-12-22 10:01:15

by Samuel Ortiz

Subject: Re: [[linux-nfc] PATCH v1.0 1/1] driver: nfc: st95hf: Fix of build error

Hi Shikha,

On Tue, Dec 22, 2015 at 04:53:37AM -0500, Shikha Singh wrote:
> Modification in core.c to rename function "irq_handler"
> and "irq_thread_handler" to "st95hf_irq_handler" and
> "st95hf_irq_thread_handler" respectively. This modification
> was done to remove build error.
>
> Signed-off-by: Shikha Singh <[email protected]>
> ---
> drivers/nfc/st95hf/core.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Applied to nfc-next, thanks.

Cheers,
Samuel.