* [PATCH] nfc: st21nfca: use setup_timer instead of init_timer
@ 2017-11-24 13:37 Colin King
2018-06-04 4:16 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2017-11-24 13:37 UTC (permalink / raw)
To: Samuel Ortiz, linux-wireless; +Cc: kernel-janitors, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nfc: st21nfca: use setup_timer instead of init_timer
2017-11-24 13:37 [PATCH] nfc: st21nfca: use setup_timer instead of init_timer Colin King
@ 2018-06-04 4:16 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2018-06-04 4:16 UTC (permalink / raw)
To: Colin King; +Cc: linux-wireless, kernel-janitors, linux-kernel
Hi Colin,
On Fri, Nov 24, 2017 at 01:37:41PM +0000, Colin King wrote:
> 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(-)
Applied to nfc-next, thanks.
Cheers,
Samuel.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-04 4:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-24 13:37 [PATCH] nfc: st21nfca: use setup_timer instead of init_timer Colin King
2018-06-04 4:16 ` Samuel Ortiz
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).