* [PATCH v2 1/4] net: af_packet: use setup_timer() helper.
@ 2017-09-25 7:30 Allen Pais
2017-09-25 7:30 ` [PATCH v2 2/4] net: nfc: hci: " Allen Pais
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Allen Pais @ 2017-09-25 7:30 UTC (permalink / raw)
To: netdev; +Cc: davem, sameo, Allen Pais
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
v2: rebased to latest net-next.
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 d288f52..b0f2218 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/4] net: nfc: hci: use setup_timer() helper.
2017-09-25 7:30 [PATCH v2 1/4] net: af_packet: use setup_timer() helper Allen Pais
@ 2017-09-25 7:30 ` Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 7:30 ` [PATCH v2 3/4] net: nfc: hci: llc_shdlc: " Allen Pais
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Allen Pais @ 2017-09-25 7:30 UTC (permalink / raw)
To: netdev; +Cc: davem, sameo, Allen Pais
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
v2: rebased to latest net-next.
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/4] net: nfc: hci: llc_shdlc: use setup_timer() helper.
2017-09-25 7:30 [PATCH v2 1/4] net: af_packet: use setup_timer() helper Allen Pais
2017-09-25 7:30 ` [PATCH v2 2/4] net: nfc: hci: " Allen Pais
@ 2017-09-25 7:30 ` Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 7:30 ` [PATCH v2 4/4] net: nfc: llcp_core: " Allen Pais
2017-09-25 20:19 ` [PATCH v2 1/4] net: af_packet: " David Miller
3 siblings, 1 reply; 8+ messages in thread
From: Allen Pais @ 2017-09-25 7:30 UTC (permalink / raw)
To: netdev; +Cc: davem, sameo, Allen Pais
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
v2: rebased to latest net-next.
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 4/4] net: nfc: llcp_core: use setup_timer() helper.
2017-09-25 7:30 [PATCH v2 1/4] net: af_packet: use setup_timer() helper Allen Pais
2017-09-25 7:30 ` [PATCH v2 2/4] net: nfc: hci: " Allen Pais
2017-09-25 7:30 ` [PATCH v2 3/4] net: nfc: hci: llc_shdlc: " Allen Pais
@ 2017-09-25 7:30 ` Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 20:19 ` [PATCH v2 1/4] net: af_packet: " David Miller
3 siblings, 1 reply; 8+ messages in thread
From: Allen Pais @ 2017-09-25 7:30 UTC (permalink / raw)
To: netdev; +Cc: davem, sameo, Allen Pais
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
v2: rebased to latest net-next.
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/4] net: af_packet: use setup_timer() helper.
2017-09-25 7:30 [PATCH v2 1/4] net: af_packet: use setup_timer() helper Allen Pais
` (2 preceding siblings ...)
2017-09-25 7:30 ` [PATCH v2 4/4] net: nfc: llcp_core: " Allen Pais
@ 2017-09-25 20:19 ` David Miller
3 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-09-25 20:19 UTC (permalink / raw)
To: allen.lkml; +Cc: netdev, sameo
From: Allen Pais <allen.lkml@gmail.com>
Date: Mon, 25 Sep 2017 13:00:02 +0530
> Use setup_timer function instead of initializing timer with the
> function and data fields.
>
> Signed-off-by: Allen Pais <allen.lkml@gmail.com>
> ---
> v2: rebased to latest net-next.
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/4] net: nfc: hci: use setup_timer() helper.
2017-09-25 7:30 ` [PATCH v2 2/4] net: nfc: hci: " Allen Pais
@ 2017-09-25 20:19 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-09-25 20:19 UTC (permalink / raw)
To: allen.lkml; +Cc: netdev, sameo
From: Allen Pais <allen.lkml@gmail.com>
Date: Mon, 25 Sep 2017 13:00:03 +0530
> Use setup_timer function instead of initializing timer with the
> function and data fields.
>
> Signed-off-by: Allen Pais <allen.lkml@gmail.com>
> ---
> v2: rebased to latest net-next.
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/4] net: nfc: hci: llc_shdlc: use setup_timer() helper.
2017-09-25 7:30 ` [PATCH v2 3/4] net: nfc: hci: llc_shdlc: " Allen Pais
@ 2017-09-25 20:19 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-09-25 20:19 UTC (permalink / raw)
To: allen.lkml; +Cc: netdev, sameo
From: Allen Pais <allen.lkml@gmail.com>
Date: Mon, 25 Sep 2017 13:00:04 +0530
> Use setup_timer function instead of initializing timer with the
> function and data fields.
>
> Signed-off-by: Allen Pais <allen.lkml@gmail.com>
> ---
> v2: rebased to latest net-next.
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 4/4] net: nfc: llcp_core: use setup_timer() helper.
2017-09-25 7:30 ` [PATCH v2 4/4] net: nfc: llcp_core: " Allen Pais
@ 2017-09-25 20:19 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-09-25 20:19 UTC (permalink / raw)
To: allen.lkml; +Cc: netdev, sameo
From: Allen Pais <allen.lkml@gmail.com>
Date: Mon, 25 Sep 2017 13:00:05 +0530
> Use setup_timer function instead of initializing timer with the
> function and data fields.
>
> Signed-off-by: Allen Pais <allen.lkml@gmail.com>
> ---
> v2: rebased to latest net-next.
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-09-25 20:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-25 7:30 [PATCH v2 1/4] net: af_packet: use setup_timer() helper Allen Pais
2017-09-25 7:30 ` [PATCH v2 2/4] net: nfc: hci: " Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 7:30 ` [PATCH v2 3/4] net: nfc: hci: llc_shdlc: " Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 7:30 ` [PATCH v2 4/4] net: nfc: llcp_core: " Allen Pais
2017-09-25 20:19 ` David Miller
2017-09-25 20:19 ` [PATCH v2 1/4] net: af_packet: " David Miller
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.