From: Daniel Mack <daniel@zonque.org>
To: sameo@linux.intel.com
Cc: linux-wireless@vger.kernel.org, colin.king@canonical.com,
shikha.singh@st.com, Daniel Mack <daniel@zonque.org>
Subject: [PATCH v2 02/10] NFC: st95hf: drop nfcdev_free
Date: Tue, 24 Jul 2018 10:54:18 +0200 [thread overview]
Message-ID: <20180724085426.23999-3-daniel@zonque.org> (raw)
In-Reply-To: <20180724085426.23999-1-daniel@zonque.org>
This flag is unneccesary. We can just nullify `ddev' instead after we freed
it and check for that in the ISR.
Signed-off-by: Daniel Mack <daniel@zonque.org>
---
drivers/nfc/st95hf/core.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
index bc1a2070f9bb..d58424ab5c48 100644
--- a/drivers/nfc/st95hf/core.c
+++ b/drivers/nfc/st95hf/core.c
@@ -220,8 +220,6 @@ struct st95_digital_cmd_complete_arg {
* from threaded ISR. Usage of this mutex avoids any race between
* deletion of the object from st95hf_remove() and its access from
* the threaded ISR.
- * @nfcdev_free: flag to have the state of nfc device object.
- * [alive | died]
* @current_protocol: current nfc protocol.
* @current_rf_tech: current rf technology.
* @fwi: frame waiting index, received in reply of RATS according to
@@ -237,7 +235,6 @@ struct st95hf_context {
unsigned char sendrcv_trflag;
struct semaphore exchange_lock;
struct mutex rm_lock;
- bool nfcdev_free;
u8 current_protocol;
u8 current_rf_tech;
int fwi;
@@ -820,8 +817,8 @@ static irqreturn_t st95hf_irq_thread_handler(int irq, void *st95hfcontext)
goto end;
}
- /* if stcontext->nfcdev_free is true, it means remove already ran */
- if (stcontext->nfcdev_free) {
+ /* if stcontext->ddev is %NULL, it means remove already ran */
+ if (!stcontext->ddev) {
result = -ENODEV;
goto end;
}
@@ -1220,7 +1217,7 @@ static int st95hf_remove(struct spi_device *nfc_spi_dev)
nfc_digital_unregister_device(stcontext->ddev);
nfc_digital_free_device(stcontext->ddev);
- stcontext->nfcdev_free = true;
+ stcontext->ddev = NULL;
mutex_unlock(&stcontext->rm_lock);
--
2.17.1
next prev parent reply other threads:[~2018-07-24 10:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 8:54 [PATCH v2 00/10] NFC: A bunch of cleanups for st95hf Daniel Mack
2018-07-24 8:54 ` [PATCH v2 01/10] Revert "NFC: st95hf: drop illegal kfree_skb()" Daniel Mack
2018-07-24 8:54 ` Daniel Mack [this message]
2018-07-24 8:54 ` [PATCH v2 03/10] NFC: st95hf: drop illegal kfree_skb() in IRQ handler Daniel Mack
2018-07-24 8:54 ` [PATCH v2 04/10] NFC: st95hf: remove logging from spi functions Daniel Mack
2018-07-24 8:54 ` [PATCH v2 05/10] NFC: st95hf: remove exchange_lock Daniel Mack
2018-07-24 8:54 ` [PATCH v2 06/10] NFC: st95hf: move skb allocation to ISR Daniel Mack
2018-07-24 8:54 ` [PATCH v2 07/10] NFC: st95hf: re-order command defines Daniel Mack
2018-07-24 8:54 ` [PATCH v2 08/10] NFC: st95hf: unify sync/async flags Daniel Mack
2018-07-24 8:54 ` [PATCH v2 09/10] NFC: st95hf: two small style nits Daniel Mack
2018-07-24 8:54 ` [PATCH v2 10/10] NFC: st95hf: add of match table Daniel Mack
2018-07-24 8:54 ` Daniel Mack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180724085426.23999-3-daniel@zonque.org \
--to=daniel@zonque.org \
--cc=colin.king@canonical.com \
--cc=linux-wireless@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=shikha.singh@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.