From: Colin King <colin.king@canonical.com>
To: Samuel Ortiz <sameo@linux.intel.com>, linux-wireless@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] nfc: st21nfca: use setup_timer instead of init_timer
Date: Fri, 24 Nov 2017 13:37:41 +0000 [thread overview]
Message-ID: <20171124133741.32371-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/nfc/st21nfca/se.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c
index 3a98563d4a12..eda1b8b0ba1d 100644
--- a/drivers/nfc/st21nfca/se.c
+++ b/drivers/nfc/st21nfca/se.c
@@ -392,15 +392,13 @@ void st21nfca_se_init(struct nfc_hci_dev *hdev)
init_completion(&info->se_info.req_completion);
/* initialize timers */
- init_timer(&info->se_info.bwi_timer);
- info->se_info.bwi_timer.data = (unsigned long)info;
- info->se_info.bwi_timer.function = st21nfca_se_wt_timeout;
+ setup_timer(&info->se_info.bwi_timer, st21nfca_se_wt_timeout,
+ (unsigned long)info);
info->se_info.bwi_active = false;
init_timer(&info->se_info.se_active_timer);
- info->se_info.se_active_timer.data = (unsigned long)info;
- info->se_info.se_active_timer.function = st21nfca_se_activation_timeout;
- info->se_info.se_active = false;
+ setup_timer(&info->se_info.se_active_timer,
+ st21nfca_se_activation_timeout, (unsigned long)info);
info->se_info.count_pipes = 0;
info->se_info.expected_pipes = 0;
--
2.14.1
next reply other threads:[~2017-11-24 13:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-24 13:37 Colin King [this message]
2018-06-04 4:16 ` [PATCH] nfc: st21nfca: use setup_timer instead of init_timer Samuel Ortiz
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=20171124133741.32371-1-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sameo@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).