nfc: st21nfca: use setup_timer instead of init_timer

Commit Message

Colin King Nov. 24, 2017, 1:37 p.m. UTC

From: Colin Ian King <[e-mail]>

Use setup_timer function instead of initializing timer with the
function and data fields.

Signed-off-by: Colin Ian King <[e-mail]>
---
 drivers/nfc/st21nfca/se.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Samuel Ortiz June 4, 2018, 4:16 a.m. UTC | #1

Hi Colin,

On Fri, Nov 24, 2017 at 01:37:41PM +0000, Colin King wrote:
> From: Colin Ian King <[e-mail]>
> 
> Use setup_timer function instead of initializing timer with the
> function and data fields.
> 
> Signed-off-by: Colin Ian King <[e-mail]>
> ---
>  drivers/nfc/st21nfca/se.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
Applied to nfc-next, thanks.

Cheers,
Samuel.

Patch

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;