[PATCH 0/5] use setup_timer() helper function.
3267d
Revision v1 of 8 in this series.
8 messages,
2 authors,
2017-09-25 · open the first message on its own page
This series uses setup_timer() helper function. The series
addresses the files under net/*.
Allen Pais (5):
net: nfc: hci: use setup_timer() helper.
net: nfc: hci: llc_shdlc: use setup_timer() helper.
net: af_packet: use setup_timer() helper.
net: nfc: core: use setup_timer() helper.
net: nfc: llcp_core: use setup_timer() helper.
net/nfc/core.c | 5 ++---
net/nfc/hci/core.c | 5 ++---
net/nfc/hci/llc_shdlc.c | 15 ++++++---------
net/nfc/llcp_core.c | 10 ++++------
net/packet/af_packet.c | 4 +---
5 files changed, 15 insertions(+), 24 deletions(-)
--
2.7.4
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
net/nfc/hci/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index b740fef..a8a6e78 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c @@ -1004,9 +1004,8 @@ int nfc_hci_register_device(struct nfc_hci_dev *hdev)
INIT_WORK ( & hdev -> msg_tx_work , nfc_hci_msg_tx_work );
- init_timer ( & hdev -> cmd_timer ); - hdev -> cmd_timer . data = ( unsigned long ) hdev ; - hdev -> cmd_timer . function = nfc_hci_cmd_timeout ; + setup_timer ( & hdev -> cmd_timer , nfc_hci_cmd_timeout , + ( unsigned long ) hdev );
skb_queue_head_init ( & hdev -> rx_hcp_frags );
--
2.7.4
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
net/nfc/hci/llc_shdlc.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 17e59a0..58df37e 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c @@ -763,17 +763,14 @@ static void *llc_shdlc_init(struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv,
mutex_init ( & shdlc -> state_mutex );
shdlc -> state = SHDLC_DISCONNECTED ;
- init_timer ( & shdlc -> connect_timer ); - shdlc -> connect_timer . data = ( unsigned long ) shdlc ; - shdlc -> connect_timer . function = llc_shdlc_connect_timeout ; + setup_timer ( & shdlc -> connect_timer , llc_shdlc_connect_timeout , + ( unsigned long ) shdlc );
- init_timer ( & shdlc -> t1_timer ); - shdlc -> t1_timer . data = ( unsigned long ) shdlc ; - shdlc -> t1_timer . function = llc_shdlc_t1_timeout ; + setup_timer ( & shdlc -> t1_timer , llc_shdlc_t1_timeout , + ( unsigned long ) shdlc );
- init_timer ( & shdlc -> t2_timer ); - shdlc -> t2_timer . data = ( unsigned long ) shdlc ; - shdlc -> t2_timer . function = llc_shdlc_t2_timeout ; + setup_timer ( & shdlc -> t2_timer , llc_shdlc_t2_timeout , + ( unsigned long ) shdlc );
shdlc -> w = SHDLC_MAX_WINDOW ;
shdlc -> srej_support = SHDLC_SREJ_SUPPORT ; --
2.7.4
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
net/packet/af_packet.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c261729..1d3e3ce 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c @@ -544,9 +544,7 @@ static void prb_init_blk_timer(struct packet_sock *po,
struct tpacket_kbdq_core * pkc ,
void ( * func ) ( unsigned long ))
{
- init_timer ( & pkc -> retire_blk_timer ); - pkc -> retire_blk_timer . data = ( long ) po ; - pkc -> retire_blk_timer . function = func ; + setup_timer ( & pkc -> retire_blk_timer , func , ( long ) po ); pkc -> retire_blk_timer . expires = jiffies ;
}
--
2.7.4
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
net/nfc/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 5cf33df..e5e23c2 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c @@ -1094,9 +1094,8 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
dev -> targets_generation = 1 ;
if ( ops -> check_presence ) {
- init_timer ( & dev -> check_pres_timer ); - dev -> check_pres_timer . data = ( unsigned long ) dev ; - dev -> check_pres_timer . function = nfc_check_pres_timeout ; + setup_timer ( & dev -> check_pres_timer , nfc_check_pres_timeout , + ( unsigned long ) dev );
INIT_WORK ( & dev -> check_pres_work , nfc_check_pres_work );
} --
2.7.4
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
net/nfc/llcp_core.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 02eef5c..7988185 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c @@ -1573,9 +1573,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
INIT_LIST_HEAD ( & local -> list );
kref_init ( & local -> ref );
mutex_init ( & local -> sdp_lock );
- init_timer ( & local -> link_timer ); - local -> link_timer . data = ( unsigned long ) local ; - local -> link_timer . function = nfc_llcp_symm_timer ; + setup_timer ( & local -> link_timer , nfc_llcp_symm_timer , + ( unsigned long ) local );
skb_queue_head_init ( & local -> tx_queue );
INIT_WORK ( & local -> tx_work , nfc_llcp_tx_work ); @@ -1601,9 +1600,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
mutex_init ( & local -> sdreq_lock );
INIT_HLIST_HEAD ( & local -> pending_sdreqs );
- init_timer ( & local -> sdreq_timer ); - local -> sdreq_timer . data = ( unsigned long ) local ; - local -> sdreq_timer . function = nfc_llcp_sdreq_timer ; + setup_timer ( & local -> sdreq_timer , nfc_llcp_sdreq_timer , + ( unsigned long ) local ); INIT_WORK ( & local -> sdreq_timeout_work , nfc_llcp_sdreq_timeout_work );
list_add ( & local -> list , & llcp_devices ); --
2.7.4
From: Allen Pais <redacted>
Date: Fri, 22 Sep 2017 16:28:17 +0530
This series uses setup_timer() helper function. The series
addresses the files under net/*.
There was a recent change to the nfc code in net-next which causes
your patches to not apply.
Please repsin against net-next, thanks.
There was a recent change to the nfc code in net-next which causes
your patches to not apply.
Please repsin against net-next, thanks.
Sent out V2.
Thanks.