[PATCH 2/2] [net-next] net: bridge: Convert timers to use timer_setup()

[Allen Pais]

switch to using the new timer_setup() and from_timer() api's.

Signed-off-by: Allen Pais <allen.p...@oracle.com>
---
 net/bridge/br_stp_timer.c | 48 +++
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index b54c1a3..e7739de 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -31,9 +31,9 @@ static int br_is_designated_for_some_port(const struct 
net_bridge *br)
return 0;
 }
 
-static void br_hello_timer_expired(unsigned long arg)
+static void br_hello_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *)arg;
+   struct net_bridge *br = from_timer(br, t, hello_timer);
 
br_debug(br, "hello timer expired\n");
spin_lock(>lock);
@@ -47,9 +47,9 @@ static void br_hello_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_message_age_timer_expired(unsigned long arg)
+static void br_message_age_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, message_age_timer);
struct net_bridge *br = p->br;
const bridge_id *id = >designated_bridge;
int was_root;
@@ -80,9 +80,9 @@ static void br_message_age_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_forward_delay_timer_expired(unsigned long arg)
+static void br_forward_delay_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, forward_delay_timer);
struct net_bridge *br = p->br;
 
br_debug(br, "port %u(%s) forward delay timer\n",
@@ -104,9 +104,9 @@ static void br_forward_delay_timer_expired(unsigned long 
arg)
spin_unlock(>lock);
 }
 
-static void br_tcn_timer_expired(unsigned long arg)
+static void br_tcn_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *) arg;
+   struct net_bridge *br = from_timer(br, t, tcn_timer);
 
br_debug(br, "tcn timer expired\n");
spin_lock(>lock);
@@ -118,9 +118,9 @@ static void br_tcn_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_topology_change_timer_expired(unsigned long arg)
+static void br_topology_change_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *) arg;
+   struct net_bridge *br = from_timer(br, t, topology_change_timer);
 
br_debug(br, "topo change timer expired\n");
spin_lock(>lock);
@@ -129,9 +129,9 @@ static void br_topology_change_timer_expired(unsigned long 
arg)
spin_unlock(>lock);
 }
 
-static void br_hold_timer_expired(unsigned long arg)
+static void br_hold_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, hold_timer);
 
br_debug(p->br, "port %u(%s) hold timer expired\n",
 (unsigned int) p->port_no, p->dev->name);
@@ -144,27 +144,17 @@ static void br_hold_timer_expired(unsigned long arg)
 
 void br_stp_timer_init(struct net_bridge *br)
 {
-   setup_timer(>hello_timer, br_hello_timer_expired,
- (unsigned long) br);
-
-   setup_timer(>tcn_timer, br_tcn_timer_expired,
- (unsigned long) br);
-
-   setup_timer(>topology_change_timer,
- br_topology_change_timer_expired,
- (unsigned long) br);
+   timer_setup(>hello_timer, br_hello_timer_expired, 0);
+   timer_setup(>tcn_timer, br_tcn_timer_expired, 0);
+   timer_setup(>topology_change_timer,
+   br_topology_change_timer_expired, 0);
 }
 
 void br_stp_port_timer_init(struct net_bridge_port *p)
 {
-   setup_timer(>message_age_timer, br_message_age_timer_expired,
- (unsigned long) p);
-
-   setup_timer(>forward_delay_timer, br_forward_delay_timer_expired,
- (unsigned long) p);
-
-   setup_timer(>hold_timer, br_hold_timer_expired,
- (unsigned long) p);
+   timer_setup(>message_age_timer, br_message_age_timer_expired, 0);
+   timer_setup(>forward_delay_timer, br_forward_delay_timer_expired, 0);
+   timer_setup(>hold_timer, br_hold_timer_expired, 0);
 }
 
 /* Report ticks left (in USER_HZ) used for API */
-- 
2.7.4

[PATCH 1/2] [net-next] net: bridge: Convert timers to use timer_setup()

[Allen Pais]

switch to using the new timer_setup() and from_timer() api's.

Signed-off-by: Allen Pais <allen.p...@oracle.com>
---
 net/bridge/br_multicast.c | 79 +++
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 7947e04..5f7f0e9 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -239,9 +239,9 @@ static void br_multicast_free_group(struct rcu_head *head)
kfree(mp);
 }
 
-static void br_multicast_group_expired(unsigned long data)
+static void br_multicast_group_expired(struct timer_list *t)
 {
-   struct net_bridge_mdb_entry *mp = (void *)data;
+   struct net_bridge_mdb_entry *mp = from_timer(mp, t, timer);
struct net_bridge *br = mp->br;
struct net_bridge_mdb_htable *mdb;
 
@@ -302,9 +302,9 @@ static void br_multicast_del_pg(struct net_bridge *br,
WARN_ON(1);
 }
 
-static void br_multicast_port_group_expired(unsigned long data)
+static void br_multicast_port_group_expired(struct timer_list *t)
 {
-   struct net_bridge_port_group *pg = (void *)data;
+   struct net_bridge_port_group *pg = from_timer(pg, t, timer);
struct net_bridge *br = pg->port->br;
 
spin_lock(>multicast_lock);
@@ -701,8 +701,7 @@ struct net_bridge_mdb_entry *br_multicast_new_group(struct 
net_bridge *br,
 
mp->br = br;
mp->addr = *group;
-   setup_timer(>timer, br_multicast_group_expired,
-   (unsigned long)mp);
+   timer_setup(>timer, br_multicast_group_expired, 0);
 
hlist_add_head_rcu(>hlist[mdb->ver], >mhash[hash]);
mdb->size++;
@@ -729,8 +728,7 @@ struct net_bridge_port_group *br_multicast_new_port_group(
p->flags = flags;
rcu_assign_pointer(p->next, next);
hlist_add_head(>mglist, >mglist);
-   setup_timer(>timer, br_multicast_port_group_expired,
-   (unsigned long)p);
+   timer_setup(>timer, br_multicast_port_group_expired, 0);
 
if (src)
memcpy(p->eth_addr, src, ETH_ALEN);
@@ -843,9 +841,10 @@ static int br_ip6_multicast_add_group(struct net_bridge 
*br,
 }
 #endif
 
-static void br_multicast_router_expired(unsigned long data)
+static void br_multicast_router_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port =
+   from_timer(port, t, multicast_router_timer);
struct net_bridge *br = port->br;
 
spin_lock(>multicast_lock);
@@ -872,9 +871,9 @@ static void br_mc_router_state_change(struct net_bridge *p,
switchdev_port_attr_set(p->dev, );
 }
 
-static void br_multicast_local_router_expired(unsigned long data)
+static void br_multicast_local_router_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *)data;
+   struct net_bridge *br = from_timer(br, t, multicast_router_timer);
 
spin_lock(>multicast_lock);
if (br->multicast_router == MDB_RTR_TYPE_DISABLED ||
@@ -900,17 +899,17 @@ static void br_multicast_querier_expired(struct 
net_bridge *br,
spin_unlock(>multicast_lock);
 }
 
-static void br_ip4_multicast_querier_expired(unsigned long data)
+static void br_ip4_multicast_querier_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (void *)data;
+   struct net_bridge *br = from_timer(br, t, ip4_other_query.timer);
 
br_multicast_querier_expired(br, >ip4_own_query);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-static void br_ip6_multicast_querier_expired(unsigned long data)
+static void br_ip6_multicast_querier_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (void *)data;
+   struct net_bridge *br = from_timer(br, t, ip6_other_query.timer);
 
br_multicast_querier_expired(br, >ip6_own_query);
 }
@@ -1011,17 +1010,17 @@ br_multicast_port_query_expired(struct net_bridge_port 
*port,
spin_unlock(>multicast_lock);
 }
 
-static void br_ip4_multicast_port_query_expired(unsigned long data)
+static void br_ip4_multicast_port_query_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port = from_timer(port, t, ip4_own_query.timer);
 
br_multicast_port_query_expired(port, >ip4_own_query);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-static void br_ip6_multicast_port_query_expired(unsigned long data)
+static void br_ip6_multicast_port_query_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port = from_timer(port, t, ip6_own_query.timer);
 
br_multicast_port_query_expired(port, >ip6_own_query);
 }
@@ -1043,13 +1042,13 @@ int br_multicast_add_port(struct net_bridge_port *port)
 {
port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
 
-   setup_timer(>multicast_ro

[PATCH 2/2] net: bridge: Convert timers to use timer_setup()

[Allen Pais]

switch to using the new timer_setup() and from_timer() api's.

Signed-off-by: Allen Pais <allen.p...@oracle.com>
---
 net/bridge/br_stp_timer.c | 48 +++
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 60b6fe2..0e68790 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -31,9 +31,9 @@ static int br_is_designated_for_some_port(const struct 
net_bridge *br)
return 0;
 }
 
-static void br_hello_timer_expired(unsigned long arg)
+static void br_hello_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *)arg;
+   struct net_bridge *br = from_timer(br, t, hello_timer);
 
br_debug(br, "hello timer expired\n");
spin_lock(>lock);
@@ -47,9 +47,9 @@ static void br_hello_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_message_age_timer_expired(unsigned long arg)
+static void br_message_age_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, message_age_timer);
struct net_bridge *br = p->br;
const bridge_id *id = >designated_bridge;
int was_root;
@@ -80,9 +80,9 @@ static void br_message_age_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_forward_delay_timer_expired(unsigned long arg)
+static void br_forward_delay_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, forward_delay_timer);
struct net_bridge *br = p->br;
 
br_debug(br, "port %u(%s) forward delay timer\n",
@@ -104,9 +104,9 @@ static void br_forward_delay_timer_expired(unsigned long 
arg)
spin_unlock(>lock);
 }
 
-static void br_tcn_timer_expired(unsigned long arg)
+static void br_tcn_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *) arg;
+   struct net_bridge *br = from_timer(br, t, tcn_timer);
 
br_debug(br, "tcn timer expired\n");
spin_lock(>lock);
@@ -118,9 +118,9 @@ static void br_tcn_timer_expired(unsigned long arg)
spin_unlock(>lock);
 }
 
-static void br_topology_change_timer_expired(unsigned long arg)
+static void br_topology_change_timer_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (struct net_bridge *) arg;
+   struct net_bridge *br = from_timer(br, t, topology_change_timer);
 
br_debug(br, "topo change timer expired\n");
spin_lock(>lock);
@@ -129,9 +129,9 @@ static void br_topology_change_timer_expired(unsigned long 
arg)
spin_unlock(>lock);
 }
 
-static void br_hold_timer_expired(unsigned long arg)
+static void br_hold_timer_expired(struct timer_list *t)
 {
-   struct net_bridge_port *p = (struct net_bridge_port *) arg;
+   struct net_bridge_port *p = from_timer(p, t, hold_timer);
 
br_debug(p->br, "port %u(%s) hold timer expired\n",
 (unsigned int) p->port_no, p->dev->name);
@@ -144,27 +144,17 @@ static void br_hold_timer_expired(unsigned long arg)
 
 void br_stp_timer_init(struct net_bridge *br)
 {
-   setup_timer(>hello_timer, br_hello_timer_expired,
- (unsigned long) br);
-
-   setup_timer(>tcn_timer, br_tcn_timer_expired,
- (unsigned long) br);
-
-   setup_timer(>topology_change_timer,
- br_topology_change_timer_expired,
- (unsigned long) br);
+   timer_setup(>hello_timer, br_hello_timer_expired, 0);
+   timer_setup(>tcn_timer, br_tcn_timer_expired, 0);
+   timer_setup(>topology_change_timer,
+   br_topology_change_timer_expired, 0);
 }
 
 void br_stp_port_timer_init(struct net_bridge_port *p)
 {
-   setup_timer(>message_age_timer, br_message_age_timer_expired,
- (unsigned long) p);
-
-   setup_timer(>forward_delay_timer, br_forward_delay_timer_expired,
- (unsigned long) p);
-
-   setup_timer(>hold_timer, br_hold_timer_expired,
- (unsigned long) p);
+   timer_setup(>message_age_timer, br_message_age_timer_expired, 0);
+   timer_setup(>forward_delay_timer, br_forward_delay_timer_expired, 0);
+   timer_setup(>hold_timer, br_hold_timer_expired, 0);
 }
 
 /* Report ticks left (in USER_HZ) used for API */
-- 
1.9.1

[PATCH 1/2] net: bridge: Convert timers to use timer_setup()

[Allen Pais]

switch to using the new timer_setup() and from_timer() api's.

Signed-off-by: Allen Pais <allen.p...@oracle.com>
---
 net/bridge/br_multicast.c | 75 +++
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 8dc5c8d..8de4d10 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -239,9 +239,9 @@ static void br_multicast_free_group(struct rcu_head *head)
kfree(mp);
 }
 
-static void br_multicast_group_expired(unsigned long data)
+static void br_multicast_group_expired(struct timer_list *t)
 {
-   struct net_bridge_mdb_entry *mp = (void *)data;
+   struct net_bridge_mdb_entry *mp = from_timer(mp, t, timer);
struct net_bridge *br = mp->br;
struct net_bridge_mdb_htable *mdb;
 
@@ -302,9 +302,9 @@ static void br_multicast_del_pg(struct net_bridge *br,
WARN_ON(1);
 }
 
-static void br_multicast_port_group_expired(unsigned long data)
+static void br_multicast_port_group_expired(struct timer_list *t)
 {
-   struct net_bridge_port_group *pg = (void *)data;
+   struct net_bridge_port_group *pg = from_timer(pg, t, timer);
struct net_bridge *br = pg->port->br;
 
spin_lock(>multicast_lock);
@@ -701,8 +701,7 @@ struct net_bridge_mdb_entry *br_multicast_new_group(struct 
net_bridge *br,
 
mp->br = br;
mp->addr = *group;
-   setup_timer(>timer, br_multicast_group_expired,
-   (unsigned long)mp);
+   timer_setup(>timer, br_multicast_group_expired, 0);
 
hlist_add_head_rcu(>hlist[mdb->ver], >mhash[hash]);
mdb->size++;
@@ -729,8 +728,7 @@ struct net_bridge_port_group *br_multicast_new_port_group(
p->flags = flags;
rcu_assign_pointer(p->next, next);
hlist_add_head(>mglist, >mglist);
-   setup_timer(>timer, br_multicast_port_group_expired,
-   (unsigned long)p);
+   timer_setup(>timer, br_multicast_port_group_expired, 0);
 
if (src)
memcpy(p->eth_addr, src, ETH_ALEN);
@@ -843,9 +841,10 @@ static int br_ip6_multicast_add_group(struct net_bridge 
*br,
 }
 #endif
 
-static void br_multicast_router_expired(unsigned long data)
+static void br_multicast_router_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port =
+   from_timer(port, t, multicast_router_timer);
struct net_bridge *br = port->br;
 
spin_lock(>multicast_lock);
@@ -859,7 +858,7 @@ static void br_multicast_router_expired(unsigned long data)
spin_unlock(>multicast_lock);
 }
 
-static void br_multicast_local_router_expired(unsigned long data)
+static void br_multicast_local_router_expired(struct timer_list *unused)
 {
 }
 
@@ -876,17 +875,17 @@ static void br_multicast_querier_expired(struct 
net_bridge *br,
spin_unlock(>multicast_lock);
 }
 
-static void br_ip4_multicast_querier_expired(unsigned long data)
+static void br_ip4_multicast_querier_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (void *)data;
+   struct net_bridge *br = from_timer(br, t, ip4_other_query.timer);
 
br_multicast_querier_expired(br, >ip4_own_query);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-static void br_ip6_multicast_querier_expired(unsigned long data)
+static void br_ip6_multicast_querier_expired(struct timer_list *t)
 {
-   struct net_bridge *br = (void *)data;
+   struct net_bridge *br = from_timer(br, t, ip6_other_query.timer);
 
br_multicast_querier_expired(br, >ip6_own_query);
 }
@@ -987,17 +986,17 @@ static void br_multicast_send_query(struct net_bridge *br,
spin_unlock(>multicast_lock);
 }
 
-static void br_ip4_multicast_port_query_expired(unsigned long data)
+static void br_ip4_multicast_port_query_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port = from_timer(port, t, ip4_own_query.timer);
 
br_multicast_port_query_expired(port, >ip4_own_query);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-static void br_ip6_multicast_port_query_expired(unsigned long data)
+static void br_ip6_multicast_port_query_expired(struct timer_list *t)
 {
-   struct net_bridge_port *port = (void *)data;
+   struct net_bridge_port *port = from_timer(port, t, ip6_own_query.timer);
 
br_multicast_port_query_expired(port, >ip6_own_query);
 }
@@ -1019,13 +1018,13 @@ int br_multicast_add_port(struct net_bridge_port *port)
 {
port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
 
-   setup_timer(>multicast_router_timer, br_multicast_router_expired,
-   (unsigned long)port);
-   setup_timer(>ip4_own_query.timer,
-   br_ip4_multicast_port_query_expired, (unsigned long)port);
+   timer_setu

[PATCH] [net-next]NFC: Convert timers to use timer_setup()

[Allen Pais]

Switch to using the new timer_setup() and from_timer()
for net/nfc/*

Signed-off-by: Allen Pais <allen.p...@oracle.com>
---
---
 net/nfc/core.c  |  8 +++-
 net/nfc/hci/core.c  |  7 +++
 net/nfc/hci/llc_shdlc.c | 23 +--
 net/nfc/llcp_core.c | 14 ++
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/net/nfc/core.c b/net/nfc/core.c
index e5e23c2..56e5467 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -1015,9 +1015,9 @@ static void nfc_check_pres_work(struct work_struct *work)
device_unlock(>dev);
 }
 
-static void nfc_check_pres_timeout(unsigned long data)
+static void nfc_check_pres_timeout(struct timer_list *t)
 {
-   struct nfc_dev *dev = (struct nfc_dev *)data;
+   struct nfc_dev *dev = from_timer(dev, t, check_pres_timer);
 
schedule_work(>check_pres_work);
 }
@@ -1094,9 +1094,7 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
dev->targets_generation = 1;
 
if (ops->check_presence) {
-   setup_timer(>check_pres_timer, nfc_check_pres_timeout,
-   (unsigned long)dev);
-
+   timer_setup(>check_pres_timer, nfc_check_pres_timeout, 0);
INIT_WORK(>check_pres_work, nfc_check_pres_work);
}
 
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index a8a6e78..ac8030c4 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -428,9 +428,9 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 
pipe, u8 event,
nfc_hci_driver_failure(hdev, r);
 }
 
-static void nfc_hci_cmd_timeout(unsigned long data)
+static void nfc_hci_cmd_timeout(struct timer_list *t)
 {
-   struct nfc_hci_dev *hdev = (struct nfc_hci_dev *)data;
+   struct nfc_hci_dev *hdev = from_timer(hdev, t, cmd_timer);
 
schedule_work(>msg_tx_work);
 }
@@ -1004,8 +1004,7 @@ int nfc_hci_register_device(struct nfc_hci_dev *hdev)
 
INIT_WORK(>msg_tx_work, nfc_hci_msg_tx_work);
 
-   setup_timer(>cmd_timer, nfc_hci_cmd_timeout,
-   (unsigned long)hdev);
+   timer_setup(>cmd_timer, nfc_hci_cmd_timeout, 0);
 
skb_queue_head_init(>rx_hcp_frags);
 
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 58df37e..fe98893 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -580,27 +580,27 @@ static void llc_shdlc_handle_send_queue(struct llc_shdlc 
*shdlc)
}
 }
 
-static void llc_shdlc_connect_timeout(unsigned long data)
+static void llc_shdlc_connect_timeout(struct timer_list *t)
 {
-   struct llc_shdlc *shdlc = (struct llc_shdlc *)data;
+   struct llc_shdlc *shdlc = from_timer(shdlc, t, connect_timer);
 
pr_debug("\n");
 
schedule_work(>sm_work);
 }
 
-static void llc_shdlc_t1_timeout(unsigned long data)
+static void llc_shdlc_t1_timeout(struct timer_list *t)
 {
-   struct llc_shdlc *shdlc = (struct llc_shdlc *)data;
+   struct llc_shdlc *shdlc = from_timer(shdlc, t, t1_timer);
 
pr_debug("SoftIRQ: need to send ack\n");
 
schedule_work(>sm_work);
 }
 
-static void llc_shdlc_t2_timeout(unsigned long data)
+static void llc_shdlc_t2_timeout(struct timer_list *t)
 {
-   struct llc_shdlc *shdlc = (struct llc_shdlc *)data;
+   struct llc_shdlc *shdlc = from_timer(shdlc, t, t2_timer);
 
pr_debug("SoftIRQ: need to retransmit\n");
 
@@ -763,14 +763,9 @@ static void *llc_shdlc_init(struct nfc_hci_dev *hdev, 
xmit_to_drv_t xmit_to_drv,
mutex_init(>state_mutex);
shdlc->state = SHDLC_DISCONNECTED;
 
-   setup_timer(>connect_timer, llc_shdlc_connect_timeout,
-   (unsigned long)shdlc);
-
-   setup_timer(>t1_timer, llc_shdlc_t1_timeout,
-   (unsigned long)shdlc);
-
-   setup_timer(>t2_timer, llc_shdlc_t2_timeout,
-   (unsigned long)shdlc);
+   timer_setup(>connect_timer, llc_shdlc_connect_timeout, 0);
+   timer_setup(>t1_timer, llc_shdlc_t1_timeout, 0);
+   timer_setup(>t2_timer, llc_shdlc_t2_timeout, 0);
 
shdlc->w = SHDLC_MAX_WINDOW;
shdlc->srej_support = SHDLC_SREJ_SUPPORT;
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 7988185..ef4026a 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -242,9 +242,9 @@ static void nfc_llcp_timeout_work(struct work_struct *work)
nfc_dep_link_down(local->dev);
 }
 
-static void nfc_llcp_symm_timer(unsigned long data)
+static void nfc_llcp_symm_timer(struct timer_list *t)
 {
-   struct nfc_llcp_local *local = (struct nfc_llcp_local *) data;
+   struct nfc_llcp_local *local = from_timer(local, t, link_timer);
 
pr_err("SYMM timeout\n");
 
@@ -285,9 +285,9 @@ static void nfc_llcp_sdreq_timeout_work(struct work_struct 
*work)
nfc_genl_llc_send_sdres(local->dev, _sdres_list);
 }
 
-st

[PATCH v2 3/4] net: nfc: hci: llc_shdlc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@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(>state_mutex);
shdlc->state = SHDLC_DISCONNECTED;
 
-   init_timer(>connect_timer);
-   shdlc->connect_timer.data = (unsigned long)shdlc;
-   shdlc->connect_timer.function = llc_shdlc_connect_timeout;
+   setup_timer(>connect_timer, llc_shdlc_connect_timeout,
+   (unsigned long)shdlc);
 
-   init_timer(>t1_timer);
-   shdlc->t1_timer.data = (unsigned long)shdlc;
-   shdlc->t1_timer.function = llc_shdlc_t1_timeout;
+   setup_timer(>t1_timer, llc_shdlc_t1_timeout,
+   (unsigned long)shdlc);
 
-   init_timer(>t2_timer);
-   shdlc->t2_timer.data = (unsigned long)shdlc;
-   shdlc->t2_timer.function = llc_shdlc_t2_timeout;
+   setup_timer(>t2_timer, llc_shdlc_t2_timeout,
+   (unsigned long)shdlc);
 
shdlc->w = SHDLC_MAX_WINDOW;
shdlc->srej_support = SHDLC_SREJ_SUPPORT;
-- 
2.7.4

[PATCH v2 2/4] net: nfc: hci: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@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(>msg_tx_work, nfc_hci_msg_tx_work);
 
-   init_timer(>cmd_timer);
-   hdev->cmd_timer.data = (unsigned long)hdev;
-   hdev->cmd_timer.function = nfc_hci_cmd_timeout;
+   setup_timer(>cmd_timer, nfc_hci_cmd_timeout,
+   (unsigned long)hdev);
 
skb_queue_head_init(>rx_hcp_frags);
 
-- 
2.7.4

[PATCH v2 4/4] net: nfc: llcp_core: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@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(>list);
kref_init(>ref);
mutex_init(>sdp_lock);
-   init_timer(>link_timer);
-   local->link_timer.data = (unsigned long) local;
-   local->link_timer.function = nfc_llcp_symm_timer;
+   setup_timer(>link_timer, nfc_llcp_symm_timer,
+   (unsigned long)local);
 
skb_queue_head_init(>tx_queue);
INIT_WORK(>tx_work, nfc_llcp_tx_work);
@@ -1601,9 +1600,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
 
mutex_init(>sdreq_lock);
INIT_HLIST_HEAD(>pending_sdreqs);
-   init_timer(>sdreq_timer);
-   local->sdreq_timer.data = (unsigned long) local;
-   local->sdreq_timer.function = nfc_llcp_sdreq_timer;
+   setup_timer(>sdreq_timer, nfc_llcp_sdreq_timer,
+   (unsigned long)local);
INIT_WORK(>sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
 
list_add(>list, _devices);
-- 
2.7.4

[PATCH v2 1/4] net: af_packet: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@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(>retire_blk_timer);
-   pkc->retire_blk_timer.data = (long)po;
-   pkc->retire_blk_timer.function = func;
+   setup_timer(>retire_blk_timer, func, (long)po);
pkc->retire_blk_timer.expires = jiffies;
 }
 
-- 
2.7.4

[PATCH 3/5] net: af_packet: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>retire_blk_timer);
-   pkc->retire_blk_timer.data = (long)po;
-   pkc->retire_blk_timer.function = func;
+   setup_timer(>retire_blk_timer, func, (long)po);
pkc->retire_blk_timer.expires = jiffies;
 }
 
-- 
2.7.4

[PATCH 5/5] net: nfc: llcp_core: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>list);
kref_init(>ref);
mutex_init(>sdp_lock);
-   init_timer(>link_timer);
-   local->link_timer.data = (unsigned long) local;
-   local->link_timer.function = nfc_llcp_symm_timer;
+   setup_timer(>link_timer, nfc_llcp_symm_timer,
+   (unsigned long)local);
 
skb_queue_head_init(>tx_queue);
INIT_WORK(>tx_work, nfc_llcp_tx_work);
@@ -1601,9 +1600,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
 
mutex_init(>sdreq_lock);
INIT_HLIST_HEAD(>pending_sdreqs);
-   init_timer(>sdreq_timer);
-   local->sdreq_timer.data = (unsigned long) local;
-   local->sdreq_timer.function = nfc_llcp_sdreq_timer;
+   setup_timer(>sdreq_timer, nfc_llcp_sdreq_timer,
+   (unsigned long)local);
INIT_WORK(>sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
 
list_add(>list, _devices);
-- 
2.7.4

[PATCH 4/5] net: nfc: core: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>check_pres_timer);
-   dev->check_pres_timer.data = (unsigned long)dev;
-   dev->check_pres_timer.function = nfc_check_pres_timeout;
+   setup_timer(>check_pres_timer, nfc_check_pres_timeout,
+   (unsigned long)dev);
 
INIT_WORK(>check_pres_work, nfc_check_pres_work);
}
-- 
2.7.4

[PATCH 2/5] net: nfc: hci: llc_shdlc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>state_mutex);
shdlc->state = SHDLC_DISCONNECTED;
 
-   init_timer(>connect_timer);
-   shdlc->connect_timer.data = (unsigned long)shdlc;
-   shdlc->connect_timer.function = llc_shdlc_connect_timeout;
+   setup_timer(>connect_timer, llc_shdlc_connect_timeout,
+   (unsigned long)shdlc);
 
-   init_timer(>t1_timer);
-   shdlc->t1_timer.data = (unsigned long)shdlc;
-   shdlc->t1_timer.function = llc_shdlc_t1_timeout;
+   setup_timer(>t1_timer, llc_shdlc_t1_timeout,
+   (unsigned long)shdlc);
 
-   init_timer(>t2_timer);
-   shdlc->t2_timer.data = (unsigned long)shdlc;
-   shdlc->t2_timer.function = llc_shdlc_t2_timeout;
+   setup_timer(>t2_timer, llc_shdlc_t2_timeout,
+   (unsigned long)shdlc);
 
shdlc->w = SHDLC_MAX_WINDOW;
shdlc->srej_support = SHDLC_SREJ_SUPPORT;
-- 
2.7.4

[PATCH 1/5] net: nfc: hci: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>msg_tx_work, nfc_hci_msg_tx_work);
 
-   init_timer(>cmd_timer);
-   hdev->cmd_timer.data = (unsigned long)hdev;
-   hdev->cmd_timer.function = nfc_hci_cmd_timeout;
+   setup_timer(>cmd_timer, nfc_hci_cmd_timeout,
+   (unsigned long)hdev);
 
skb_queue_head_init(>rx_hcp_frags);
 
-- 
2.7.4

[PATCH 0/5] use setup_timer() helper function.

[Allen Pais]

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

[PATCH 02/64] drivers: net: b44: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/b44.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/b44.c 
b/drivers/net/ethernet/broadcom/b44.c
index a1125d1..42e44fc 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1474,10 +1474,8 @@ static int b44_open(struct net_device *dev)
goto out;
}
 
-   init_timer(>timer);
+   setup_timer(>timer, b44_timer, (unsigned long)bp);
bp->timer.expires = jiffies + HZ;
-   bp->timer.data = (unsigned long) bp;
-   bp->timer.function = b44_timer;
add_timer(>timer);
 
b44_enable_ints(bp);
-- 
2.7.4

[PATCH 01/64] drivers: net: de4x: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/dec/tulip/de4x5.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c 
b/drivers/net/ethernet/dec/tulip/de4x5.c
index 0affee9..299812e 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1147,9 +1147,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, 
struct device *gendev)
lp->timeout = -1;
lp->gendev = gendev;
spin_lock_init(>lock);
-   init_timer(>timer);
-   lp->timer.function = (void (*)(unsigned long))de4x5_ast;
-   lp->timer.data = (unsigned long)dev;
+   setup_timer(>timer, (void (*)(unsigned long))de4x5_ast,
+   (unsigned long)dev);
de4x5_parse_params(dev);
 
/*
-- 
2.7.4

[PATCH 00/64] use setup_timer() helper function.

[Allen Pais]

 This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.


Allen Pais (64):
  drivers: net: de4x: use setup_timer() helper.
  drivers: net: b44: use setup_timer() helper.
  drivers: net: pcnet32: use setup_timer() helper.
  drivers: net: brcm80211: use setup_timer() helper.
  drivers : net: niu: use setup_timer() helper.
  drivers: net: bcm63xx: use setup_timer() helper.
  drivers: net: declance: use setup_timer() helper.
  drivers: net: am79c961: use setup_timer() helper.
  drivers: net: et131x: use setup_timer() helper.
  drivers: net: appletalk: cops: use setup_timer() helper.
  drivers: net: rsi_91x: use setup_timer() helper.
  drivers: net: atp: use setup_timer() helper.
  drivers: net: ns83820: use setup_timer() helper.
  drivers: net: ixgb: use setup_timer() helper.
  drivers: net: sundance: use setup_timer() helper.
  drivers: net: tg3: use setup_timer() helper.
  drivers: net: sdla: use setup_timer() helper.
  drivers: net: cisco_hdlc: use setup_timer() helper.
  drivers: net: slip: use setup_timer() helper.
  drivers: net: spider_net: use setup_timer() helper.
  drivers: net: sun: cassini: use setup_timer() helper.
  drivers: net: natsemi: use setup_timer() helper.
  drivers: net: winbond-840: use setup_timer() helper.
  drivers: net: enic: use setup_timer() helper.
  drivers: net: bnx2: use setup_timer() helper.
  drivers: net: xen-netback: use setup_timer() helper.
  drivers: net: atmel: use setup_timer() helper.
  drivers: net: hippi: use setup_timer() helper.
  drivers: net: smsc: use setup_timer() helper.
  drivers: net: qlogic: use setup_timer() helper.
  drivers: net: e1000e: use setup_timer() helper.
  drivers: net: amd: use setup_timer() helper.
  drivers: net: amd8111e: use setup_timer() helper.
  drivers: net: eql: use setup_timer() helper.
  drivers: net: can: usb: use setup_timer() helper.
  drivers: net: can: use setup_timer() helper.
  drivers: net: arcnet: use setup_timer() helper.
  drivers: net: ath6kl: use setup_timer() helper.
  drivers: net: sun: use setup_timer() helper.
  drivers: net: sis900: use setup_timer() helper.
  drivers: net: packetengines: use setup_timer() helper.
  drivers: net: mlx5: use setup_timer() helper.
  drivers: net: mlx4: use setup_timer() helper.
  drivers: net: pxa168: use setup_timer() helper.
  drivers: net: fealnx: use setup_timer() helper.
  drivers: net: dmfe: use setup_timer() helper.
  drivers: net: bnxt: use setup_timer() helper.
  drivers: net: amd: use setup_timer() helper.
  drivers: net: adi: use setup_timer() helper.
  drivers: net: can: sja1000: use setup_timer() helper.
  drivers: net: caif: use setup_timer() helper.
  drivers: net: appletalk: use setup_timer() helper.
  drivers: net: dscc: use setup_timer() helper.
  drivers: net: hdlc_ppp: use setup_timer() helper.
  drivers: net: hamradio: use setup_timer() helper.
  drivers: net: cpsw_ale: use setup_timer() helper.
  drivers: net: stmmac: use setup_timer() helper.
  drivers: net: packetengines: use setup_timer() helper.
  drivers: net: i40evf: use setup_timer() helper.
  drivers: net: uli526x: use setup_timer() helper.
  drivers: net: enic: use setup_timer() helper.
  drivers: net: cxgb: use setup_timer() helper.
  drivers: net: bnx2x: use setup_timer() helper.
  drivers: net: lmc: use setup_timer() helper.

 drivers/net/appletalk/cops.c  |  4 +---
 drivers/net/appletalk/ltpc.c  |  4 +---
 drivers/net/arcnet/arcnet.c   |  4 +---
 drivers/net/caif/caif_hsi.c   | 15 ++-
 drivers/net/can/grcan.c   | 10 --
 drivers/net/can/sja1000/peak_pcmcia.c |  4 +---
 drivers/net/can/usb/peak_usb/pcan_usb.c   |  5 ++---
 drivers/net/eql.c |  4 +---
 drivers/net/ethernet/adi/bfin_mac.c   |  5 ++---
 drivers/net/ethernet/agere/et131x.c   |  5 ++---
 drivers/net/ethernet/amd/a2065.c  |  7 +++
 drivers/net/ethernet/amd/am79c961a.c  |  4 +---
 drivers/net/ethernet/amd/amd8111e.c   |  5 ++---
 drivers/net/ethernet/amd/declance.c   |  6 +++---
 drivers/net/ethernet/amd/pcnet32.c|  5 ++---
 drivers/net/ethernet/amd/sunlance.c   |  5 ++---
 drivers/net/ethernet/broadcom/b44.c   |  4 +---
 drivers/net/ethernet/broadcom/bcm63xx_enet.c  |  5 ++---
 drivers/net/ethernet/broadcom/bnx2.c  |  4 +---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  4 +---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 +---
 drivers/net/ethernet/broadcom/tg3.c   |  4 +---
 drivers/net/ethernet/chelsio/cxgb/sge.c   |  5 ++---
 drivers/net/ethernet/cisco/enic/enic_clsf.h

[PATCH 03/64] drivers: net: pcnet32: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/pcnet32.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/pcnet32.c 
b/drivers/net/ethernet/amd/pcnet32.c
index 7f60d17..e461536 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1970,9 +1970,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct 
pci_dev *pdev)
lp->options |= PCNET32_PORT_MII;
}
 
-   init_timer(>watchdog_timer);
-   lp->watchdog_timer.data = (unsigned long)dev;
-   lp->watchdog_timer.function = (void *)_watchdog;
+   setup_timer(>watchdog_timer, (void *)_watchdog,
+   (unsigned long)dev);
 
/* The PCNET32-specific entries in the device structure. */
dev->netdev_ops = _netdev_ops;
-- 
2.7.4

[PATCH 05/64] drivers : net: niu: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sun/niu.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 6a4e8e1..bde19b3 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -6123,10 +6123,8 @@ static int niu_open(struct net_device *dev)
 
err = niu_init_hw(np);
if (!err) {
-   init_timer(>timer);
+   setup_timer(>timer, niu_timer, (unsigned long)np);
np->timer.expires = jiffies + HZ;
-   np->timer.data = (unsigned long) np;
-   np->timer.function = niu_timer;
 
err = niu_enable_interrupts(np, 1);
if (err)
-- 
2.7.4

[PATCH 07/64] drivers: net: declance: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/declance.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/declance.c 
b/drivers/net/ethernet/amd/declance.c
index 82cc813..9bdf81c 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -1246,9 +1246,9 @@ static int dec_lance_probe(struct device *bdev, const int 
type)
 * can occur from interrupts (ex. IPv6).  So we
 * use a timer to try again later when necessary. -DaveM
 */
-   init_timer(>multicast_timer);
-   lp->multicast_timer.data = (unsigned long) dev;
-   lp->multicast_timer.function = lance_set_multicast_retry;
+   setup_timer(>multicast_timer, lance_set_multicast_retry,
+   (unsigned long)dev);
+
 
ret = register_netdev(dev);
if (ret) {
-- 
2.7.4

[PATCH 10/64] drivers: net: appletalk: cops: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/appletalk/cops.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 486e1e6..caf0428 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -424,9 +424,7 @@ static int cops_open(struct net_device *dev)
 */
if(lp->board==TANGENT)  /* Poll 20 times per second */
{
-   init_timer(_timer);
-   cops_timer.function = cops_poll;
-   cops_timer.data = (unsigned long)dev;
+   setup_timer(_timer, cops_poll, (unsigned long)dev);
cops_timer.expires  = jiffies + HZ/20;
add_timer(_timer);
} 
-- 
2.7.4

[PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wireless/rsi/rsi_91x_hal.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c 
b/drivers/net/wireless/rsi/rsi_91x_hal.c
index 070dfd6..7ad286d 100644
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -411,9 +411,8 @@ static void bl_cmd_timeout(unsigned long priv)
 
 static int bl_start_cmd_timer(struct rsi_hw *adapter, u32 timeout)
 {
-   init_timer(>bl_cmd_timer);
-   adapter->bl_cmd_timer.data = (unsigned long)adapter;
-   adapter->bl_cmd_timer.function = (void *)_cmd_timeout;
+   setup_timer(>bl_cmd_timer, (void *)_cmd_timeout,
+   (unsigned long)adapter);
adapter->bl_cmd_timer.expires = (msecs_to_jiffies(timeout) + jiffies);
 
adapter->blcmd_timer_expired = false;
-- 
2.7.4

[PATCH 12/64] drivers: net: atp: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/realtek/atp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/realtek/atp.c 
b/drivers/net/ethernet/realtek/atp.c
index bed3468..bdc3833 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -438,10 +438,8 @@ static int net_open(struct net_device *dev)
 
hardware_init(dev);
 
-   init_timer(>timer);
+   setup_timer(>timer, atp_timed_checker, (unsigned long)dev);
lp->timer.expires = jiffies + TIMED_CHECKER;
-   lp->timer.data = (unsigned long)dev;
-   lp->timer.function = atp_timed_checker;/* timer handler */
add_timer(>timer);
 
netif_start_queue(dev);
-- 
2.7.4

[PATCH 13/64] drivers: net: ns83820: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/natsemi/ns83820.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/ns83820.c 
b/drivers/net/ethernet/natsemi/ns83820.c
index 729095d..99d3c78 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -1652,9 +1652,7 @@ static int ns83820_open(struct net_device *ndev)
writel(0, dev->base + TXDP_HI);
writel(desc, dev->base + TXDP);
 
-   init_timer(>tx_watchdog);
-   dev->tx_watchdog.data = (unsigned long)ndev;
-   dev->tx_watchdog.function = ns83820_tx_watch;
+   setup_timer(>tx_watchdog, ns83820_tx_watch, (unsigned long)ndev);
mod_timer(>tx_watchdog, jiffies + 2*HZ);
 
netif_start_queue(ndev);/* FIXME: wait for phy to come up */
-- 
2.7.4

[PATCH 14/64] drivers: net: ixgb: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c 
b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 5a71319..1e6ec22 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -508,9 +508,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id 
*ent)
 
adapter->part_num = ixgb_get_ee_pba_number(>hw);
 
-   init_timer(>watchdog_timer);
-   adapter->watchdog_timer.function = ixgb_watchdog;
-   adapter->watchdog_timer.data = (unsigned long)adapter;
+   setup_timer(>watchdog_timer, ixgb_watchdog,
+   (unsigned long)adapter);
 
INIT_WORK(>tx_timeout_task, ixgb_tx_timeout_task);
 
-- 
2.7.4

[PATCH 15/64] drivers: net: sundance: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/dlink/sundance.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dlink/sundance.c 
b/drivers/net/ethernet/dlink/sundance.c
index 2704bcf..6ca9e98 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -913,10 +913,8 @@ static int netdev_open(struct net_device *dev)
   ioread16(ioaddr + MACCtrl1), ioread16(ioaddr + 
MACCtrl0));
 
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, netdev_timer, (unsigned long)dev);
np->timer.expires = jiffies + 3*HZ;
-   np->timer.data = (unsigned long)dev;
-   np->timer.function = netdev_timer;  /* 
timer handler */
add_timer(>timer);
 
/* Enable interrupts by setting the interrupt mask. */
-- 
2.7.4

[PATCH 16/64] drivers: net: tg3: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/tg3.c 
b/drivers/net/ethernet/broadcom/tg3.c
index 656e6af..d8d5f20 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11087,9 +11087,7 @@ static void tg3_timer_init(struct tg3 *tp)
tp->asf_multiplier = (HZ / tp->timer_offset) *
 TG3_FW_UPDATE_FREQ_SEC;
 
-   init_timer(>timer);
-   tp->timer.data = (unsigned long) tp;
-   tp->timer.function = tg3_timer;
+   setup_timer(>timer, tg3_timer, (unsigned long)tp);
 }
 
 static void tg3_timer_start(struct tg3 *tp)
-- 
2.7.4

[PATCH 20/64] drivers: net: spider_net: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/toshiba/spider_net.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/toshiba/spider_net.c 
b/drivers/net/ethernet/toshiba/spider_net.c
index cec9e70..a913538 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -2256,16 +2256,14 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
pci_set_drvdata(card->pdev, netdev);
 
-   init_timer(>tx_timer);
-   card->tx_timer.function =
-   (void (*)(unsigned long)) spider_net_cleanup_tx_ring;
-   card->tx_timer.data = (unsigned long) card;
+   setup_timer(>tx_timer,
+   (void(*)(unsigned long))spider_net_cleanup_tx_ring,
+   (unsigned long)card);
netdev->irq = card->pdev->irq;
 
card->aneg_count = 0;
-   init_timer(>aneg_timer);
-   card->aneg_timer.function = spider_net_link_phy;
-   card->aneg_timer.data = (unsigned long) card;
+   setup_timer(>aneg_timer, spider_net_link_phy,
+   (unsigned long)card);
 
netif_napi_add(netdev, >napi,
   spider_net_poll, SPIDER_NET_NAPI_WEIGHT);
-- 
2.7.4

[PATCH 17/64] drivers: net: sdla: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/sdla.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 236c625..0cc4890 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1617,10 +1617,8 @@ static void setup_sdla(struct net_device *dev)
flp->deassoc= sdla_deassoc;
flp->dlci_conf  = sdla_dlci_conf;
 
-   init_timer(>timer);
+   setup_timer(>timer, sdla_poll, (unsigned long)dev);
flp->timer.expires  = 1;
-   flp->timer.data = (unsigned long) dev;
-   flp->timer.function = sdla_poll;
 }
 
 static struct net_device *sdla;
-- 
2.7.4

[PATCH 18/64] drivers: net: cisco_hdlc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/hdlc_cisco.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index a408abc..c696d42 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -293,10 +293,8 @@ static void cisco_start(struct net_device *dev)
st->up = st->txseq = st->rxseq = 0;
spin_unlock_irqrestore(>lock, flags);
 
-   init_timer(>timer);
+   setup_timer(>timer, cisco_timer, (unsigned long)dev);
st->timer.expires = jiffies + HZ; /* First poll after 1 s */
-   st->timer.function = cisco_timer;
-   st->timer.data = (unsigned long)dev;
add_timer(>timer);
 }
 
-- 
2.7.4

[PATCH 19/64] drivers: net: slip: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/slip/slip.c | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 436dd78..eb8a189 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -763,12 +763,8 @@ static struct slip *sl_alloc(dev_t line)
sl->mode= SL_MODE_DEFAULT;
 #ifdef CONFIG_SLIP_SMART
/* initialize timer_list struct */
-   init_timer(>keepalive_timer);
-   sl->keepalive_timer.data = (unsigned long)sl;
-   sl->keepalive_timer.function = sl_keepalive;
-   init_timer(>outfill_timer);
-   sl->outfill_timer.data = (unsigned long)sl;
-   sl->outfill_timer.function = sl_outfill;
+   setup_timer(>keepalive_timer, sl_keepalive, (unsigned long)sl);
+   setup_timer(>outfill_timer, sl_outfill, (unsigned long)sl);
 #endif
slip_devs[i] = dev;
return sl;
-- 
2.7.4

[PATCH 22/64] drivers: net: natsemi: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/natsemi/natsemi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/natsemi.c 
b/drivers/net/ethernet/natsemi/natsemi.c
index 18af2a2..dedeacd 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -1571,10 +1571,8 @@ static int netdev_open(struct net_device *dev)
dev->name, (int)readl(ioaddr + ChipCmd));
 
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, netdev_timer, (unsigned long)dev);
np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
-   np->timer.data = (unsigned long)dev;
-   np->timer.function = netdev_timer; /* timer handler */
add_timer(>timer);
 
return 0;
-- 
2.7.4

[PATCH 21/64] drivers: net: sun: cassini: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sun/cassini.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sun/cassini.c 
b/drivers/net/ethernet/sun/cassini.c
index 382993c..a74d78f 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -5039,10 +5039,7 @@ static int cas_init_one(struct pci_dev *pdev, const 
struct pci_device_id *ent)
spin_lock_init(>stat_lock[N_TX_RINGS]);
mutex_init(>pm_mutex);
 
-   init_timer(>link_timer);
-   cp->link_timer.function = cas_link_timer;
-   cp->link_timer.data = (unsigned long) cp;
-
+   setup_timer(>link_timer, cas_link_timer, (unsigned long)cp);
 #if 1
/* Just in case the implementation of atomic operations
 * change so that an explicit initialization is necessary.
-- 
2.7.4

[PATCH 23/64] drivers: net: winbond-840: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c 
b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 32d7229..6f88d68 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -655,10 +655,8 @@ static int netdev_open(struct net_device *dev)
netdev_dbg(dev, "Done netdev_open()\n");
 
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, netdev_timer, (unsigned long)dev);
np->timer.expires = jiffies + 1*HZ;
-   np->timer.data = (unsigned long)dev;
-   np->timer.function = netdev_timer;  /* 
timer handler */
add_timer(>timer);
return 0;
 out_err:
-- 
2.7.4

[PATCH 26/64] drivers: net: xen-netback: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/xen-netback/interface.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/xen-netback/interface.c 
b/drivers/net/xen-netback/interface.c
index ee8ed9da..dcfcb15 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -520,8 +520,7 @@ int xenvif_init_queue(struct xenvif_queue *queue)
 
queue->credit_bytes = queue->remaining_credit = ~0UL;
queue->credit_usec  = 0UL;
-   init_timer(>credit_timeout);
-   queue->credit_timeout.function = xenvif_tx_credit_callback;
+   setup_timer(>credit_timeout, xenvif_tx_credit_callback, 0UL);
queue->credit_window_start = get_jiffies_64();
 
queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES;
-- 
2.7.4

[PATCH 24/64] drivers: net: enic: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/cisco/enic/enic_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c 
b/drivers/net/ethernet/cisco/enic/enic_main.c
index d24ee1a..4a11baf 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2846,9 +2846,8 @@ static int enic_probe(struct pci_dev *pdev, const struct 
pci_device_id *ent)
/* Setup notification timer, HW reset task, and wq locks
 */
 
-   init_timer(>notify_timer);
-   enic->notify_timer.function = enic_notify_timer;
-   enic->notify_timer.data = (unsigned long)enic;
+   setup_timer(>notify_timer, enic_notify_timer,
+   (unsigned long)enic);
 
enic_set_rx_coal_setting(enic);
INIT_WORK(>reset, enic_reset);
-- 
2.7.4

[PATCH 25/64] drivers: net: bnx2: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/bnx2.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c 
b/drivers/net/ethernet/broadcom/bnx2.c
index e3af1f3..b3055a7 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8462,10 +8462,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device 
*dev)
bnx2_set_default_link(bp);
bp->req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;
 
-   init_timer(>timer);
+   setup_timer(>timer, bnx2_timer, (unsigned long)bp);
bp->timer.expires = RUN_AT(BNX2_TIMER_INTERVAL);
-   bp->timer.data = (unsigned long) bp;
-   bp->timer.function = bnx2_timer;
 
 #ifdef BCM_CNIC
if (bnx2_shmem_rd(bp, BNX2_ISCSI_INITIATOR) & BNX2_ISCSI_INITIATOR_EN)
-- 
2.7.4

[PATCH 27/64] drivers: net: atmel: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wireless/atmel/atmel.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/atmel/atmel.c 
b/drivers/net/wireless/atmel/atmel.c
index b68436b..e816d53 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -1579,11 +1579,10 @@ struct net_device *init_atmel_card(unsigned short irq, 
unsigned long port,
priv->default_beacon_period = priv->beacon_period = 100;
priv->listen_interval = 1;
 
-   init_timer(>management_timer);
+   setup_timer(>management_timer, atmel_management_timer,
+   (unsigned long)dev);
spin_lock_init(>irqlock);
spin_lock_init(>timerlock);
-   priv->management_timer.function = atmel_management_timer;
-   priv->management_timer.data = (unsigned long) dev;
 
dev->netdev_ops = _netdev_ops;
dev->wireless_handlers = _handler_def;
-- 
2.7.4

[PATCH 28/64] drivers: net: hippi: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/hippi/rrunner.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 71ddadb..76cc140 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1229,10 +1229,8 @@ static int rr_open(struct net_device *dev)
 
/* Set the timer to switch to check for link beat and perhaps switch
   to an alternate media type. */
-   init_timer(>timer);
+   setup_timer(>timer, rr_timer, (unsigned long)dev);
rrpriv->timer.expires = RUN_AT(5*HZ);   /* 5 sec. watchdog */
-   rrpriv->timer.data = (unsigned long)dev;
-   rrpriv->timer.function = rr_timer;   /* timer handler */
add_timer(>timer);
 
netif_start_queue(dev);
-- 
2.7.4

[PATCH 29/64] drivers: net: smsc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/smsc/epic100.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/smsc/epic100.c 
b/drivers/net/ethernet/smsc/epic100.c
index 6a0e1d4..2a97248 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -739,10 +739,8 @@ static int epic_open(struct net_device *dev)
 
/* Set the timer to switch to check for link beat and perhaps switch
   to an alternate media type. */
-   init_timer(>timer);
+   setup_timer(>timer, epic_timer, (unsigned long)dev);
ep->timer.expires = jiffies + 3*HZ;
-   ep->timer.data = (unsigned long)dev;
-   ep->timer.function = epic_timer;/* 
timer handler */
add_timer(>timer);
 
return rc;
-- 
2.7.4

[PATCH 32/64] drivers: net: amd: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/sunlance.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/sunlance.c 
b/drivers/net/ethernet/amd/sunlance.c
index 291ca51..0183ffb 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1459,9 +1459,8 @@ static int sparc_lance_probe_one(struct platform_device 
*op,
 * can occur from interrupts (ex. IPv6).  So we
 * use a timer to try again later when necessary. -DaveM
 */
-   init_timer(>multicast_timer);
-   lp->multicast_timer.data = (unsigned long) dev;
-   lp->multicast_timer.function = lance_set_multicast_retry;
+   setup_timer(>multicast_timer, lance_set_multicast_retry,
+   (unsigned long)dev);
 
if (register_netdev(dev)) {
printk(KERN_ERR "SunLance: Cannot register device.\n");
-- 
2.7.4

[PATCH 33/64] drivers: net: amd8111e: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/amd8111e.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/amd8111e.c 
b/drivers/net/ethernet/amd/amd8111e.c
index 7b5df56..7f22af6 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -1883,9 +1883,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
 
/* Initialize software ipg timer */
if(lp->options & OPTION_DYN_IPG_ENABLE){
-   init_timer(>ipg_data.ipg_timer);
-   lp->ipg_data.ipg_timer.data = (unsigned long) dev;
-   lp->ipg_data.ipg_timer.function = (void *)_config_ipg;
+   setup_timer(>ipg_data.ipg_timer,
+   (void *)_config_ipg, (unsigned long)dev);
lp->ipg_data.ipg_timer.expires = jiffies +
 IPG_CONVERGE_JIFFIES;
lp->ipg_data.ipg = DEFAULT_IPG;
-- 
2.7.4

[PATCH 31/64] drivers: net: e1000e: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c 
b/drivers/net/ethernet/intel/e1000e/netdev.c
index 327dfe5..8436c5f 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7252,13 +7252,10 @@ static int e1000_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
goto err_eeprom;
}
 
-   init_timer(>watchdog_timer);
-   adapter->watchdog_timer.function = e1000_watchdog;
-   adapter->watchdog_timer.data = (unsigned long)adapter;
-
-   init_timer(>phy_info_timer);
-   adapter->phy_info_timer.function = e1000_update_phy_info;
-   adapter->phy_info_timer.data = (unsigned long)adapter;
+   setup_timer(>watchdog_timer, e1000_watchdog,
+   (unsigned long)adapter);
+   setup_timer(>phy_info_timer, e1000_update_phy_info,
+   (unsigned long)adapter);
 
INIT_WORK(>reset_task, e1000_reset_task);
INIT_WORK(>watchdog_task, e1000_watchdog_task);
-- 
2.7.4

[PATCH 36/64] drivers: net: can: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/can/grcan.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index a7be12d..8570cfd 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1626,13 +1626,11 @@ static int grcan_setup_netdev(struct platform_device 
*ofdev,
spin_lock_init(>lock);
 
if (priv->need_txbug_workaround) {
-   init_timer(>rr_timer);
-   priv->rr_timer.function = grcan_running_reset;
-   priv->rr_timer.data = (unsigned long)dev;
+   setup_timer(>rr_timer, grcan_running_reset,
+   (unsigned long)dev);
 
-   init_timer(>hang_timer);
-   priv->hang_timer.function = grcan_initiate_running_reset;
-   priv->hang_timer.data = (unsigned long)dev;
+   setup_timer(>hang_timer, grcan_initiate_running_reset,
+   (unsigned long)dev);
}
 
netif_napi_add(dev, >napi, grcan_poll, GRCAN_NAPI_WEIGHT);
-- 
2.7.4

[PATCH 34/64] drivers: net: eql: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/eql.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index fe13bfe..fccce4b 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -178,10 +178,8 @@ static void __init eql_setup(struct net_device *dev)
 {
equalizer_t *eql = netdev_priv(dev);
 
-   init_timer(>timer);
-   eql->timer.data = (unsigned long) eql;
+   setup_timer(>timer, eql_timer, (unsigned long)eql);
eql->timer.expires  = jiffies + EQL_DEFAULT_RESCHED_IVAL;
-   eql->timer.function = eql_timer;
 
spin_lock_init(>queue.lock);
INIT_LIST_HEAD(>queue.all_slaves);
-- 
2.7.4

[PATCH 35/64] drivers: net: can: usb: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/can/usb/peak_usb/pcan_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c 
b/drivers/net/can/usb/peak_usb/pcan_usb.c
index 838545c..7e10dbd 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c
@@ -798,9 +798,8 @@ static int pcan_usb_init(struct peak_usb_device *dev)
int err;
 
/* initialize a timer needed to wait for hardware restart */
-   init_timer(>restart_timer);
-   pdev->restart_timer.function = pcan_usb_restart;
-   pdev->restart_timer.data = (unsigned long)dev;
+   setup_timer(>restart_timer, pcan_usb_restart,
+   (unsigned long)dev);
 
/*
 * explicit use of dev_xxx() instead of netdev_xxx() here:
-- 
2.7.4

[PATCH 37/64] drivers: net: arcnet: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/arcnet/arcnet.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index fcfccbb..13236b2 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -450,9 +450,7 @@ struct net_device *alloc_arcdev(const char *name)
 
lp->dev = dev;
spin_lock_init(>lock);
-   init_timer(>timer);
-   lp->timer.data = (unsigned long) dev;
-   lp->timer.function = arcnet_timer;
+   setup_timer(>timer, arcnet_timer, (unsigned long)dev);
}
 
return dev;
-- 
2.7.4

[PATCH 38/64] drivers: net: ath6kl: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wireless/ath/ath6kl/txrx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c 
b/drivers/net/wireless/ath/ath6kl/txrx.c
index e6b2517..4e5cc2b 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1753,9 +1753,7 @@ void aggr_conn_init(struct ath6kl_vif *vif, struct 
aggr_info *aggr_info,
 
aggr_conn->aggr_sz = AGGR_SZ_DEFAULT;
aggr_conn->dev = vif->ndev;
-   init_timer(_conn->timer);
-   aggr_conn->timer.function = aggr_timeout;
-   aggr_conn->timer.data = (unsigned long) aggr_conn;
+   setup_timer(_conn->timer, aggr_timeout, (unsigned long)aggr_conn);
aggr_conn->aggr_info = aggr_info;
 
aggr_conn->timer_scheduled = false;
-- 
2.7.4

[PATCH 39/64] drivers: net: sun: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sun/sungem.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sun/sungem.c 
b/drivers/net/ethernet/sun/sungem.c
index fa607d0..b75ab8f 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2910,9 +2910,7 @@ static int gem_init_one(struct pci_dev *pdev, const 
struct pci_device_id *ent)
 
gp->msg_enable = DEFAULT_MSG;
 
-   init_timer(>link_timer);
-   gp->link_timer.function = gem_link_timer;
-   gp->link_timer.data = (unsigned long) gp;
+   setup_timer(>link_timer, gem_link_timer, (unsigned long)gp);
 
INIT_WORK(>reset_task, gem_reset_task);
 
-- 
2.7.4

[PATCH 40/64] drivers: net: sis900: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sis/sis900.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sis/sis900.c 
b/drivers/net/ethernet/sis/sis900.c
index 40bd883..cb61247 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1065,10 +1065,8 @@ sis900_open(struct net_device *net_dev)
 
/* Set the timer to switch to check for link beat and perhaps switch
   to an alternate media type. */
-   init_timer(_priv->timer);
+   setup_timer(_priv->timer, sis900_timer, (unsigned long)net_dev);
sis_priv->timer.expires = jiffies + HZ;
-   sis_priv->timer.data = (unsigned long)net_dev;
-   sis_priv->timer.function = sis900_timer;
add_timer(_priv->timer);
 
return 0;
-- 
2.7.4

[PATCH 42/64] drivers: net: mlx5: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c 
b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 8aea0a0..a89a68c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -320,15 +320,13 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev)
 {
struct mlx5_core_health *health = >priv.health;
 
-   init_timer(>timer);
+   setup_timer(>timer, poll_health, (unsigned long)dev);
health->sick = 0;
clear_bit(MLX5_DROP_NEW_HEALTH_WORK, >flags);
clear_bit(MLX5_DROP_NEW_RECOVERY_WORK, >flags);
health->health = >iseg->health;
health->health_counter = >iseg->health_counter;
 
-   health->timer.data = (unsigned long)dev;
-   health->timer.function = poll_health;
health->timer.expires = round_jiffies(jiffies + 
MLX5_HEALTH_POLL_INTERVAL);
add_timer(>timer);
 }
-- 
2.7.4

[PATCH 41/64] drivers: net: packetengines: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/packetengines/yellowfin.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/packetengines/yellowfin.c 
b/drivers/net/ethernet/packetengines/yellowfin.c
index fa7770d..33c241f 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -632,10 +632,8 @@ static int yellowfin_open(struct net_device *dev)
}
 
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, yellowfin_timer, (unsigned long)dev);
yp->timer.expires = jiffies + 3*HZ;
-   yp->timer.data = (unsigned long)dev;
-   yp->timer.function = yellowfin_timer;   /* 
timer handler */
add_timer(>timer);
 out:
return rc;
-- 
2.7.4

[PATCH 43/64] drivers: net: mlx4: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/mellanox/mlx4/catas.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c 
b/drivers/net/ethernet/mellanox/mlx4/catas.c
index 53daa6c..de0f9e5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/catas.c
+++ b/drivers/net/ethernet/mellanox/mlx4/catas.c
@@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
phys_addr_t addr;
 
INIT_LIST_HEAD(>catas_err.list);
-   init_timer(>catas_err.timer);
+   setup_timer(>catas_err.timer, poll_catas, (unsigned long)dev);
priv->catas_err.map = NULL;
 
if (!mlx4_is_slave(dev)) {
@@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
}
}
 
-   priv->catas_err.timer.data = (unsigned long) dev;
-   priv->catas_err.timer.function = poll_catas;
priv->catas_err.timer.expires  =
round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL);
add_timer(>catas_err.timer);
-- 
2.7.4

[PATCH 44/64] drivers: net: pxa168: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/marvell/pxa168_eth.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c 
b/drivers/net/ethernet/marvell/pxa168_eth.c
index 9937249..91b1c15 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1496,9 +1496,8 @@ static int pxa168_eth_probe(struct platform_device *pdev)
netif_napi_add(dev, >napi, pxa168_rx_poll, pep->rx_ring_size);
 
memset(>timeout, 0, sizeof(struct timer_list));
-   init_timer(>timeout);
-   pep->timeout.function = rxq_refill_timer_wrapper;
-   pep->timeout.data = (unsigned long)pep;
+   setup_timer(>timeout, rxq_refill_timer_wrapper,
+   (unsigned long)pep);
 
pep->smi_bus = mdiobus_alloc();
if (!pep->smi_bus) {
-- 
2.7.4

[PATCH 45/64] drivers: net: fealnx: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/fealnx.c | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index e92859d..c898231 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -909,17 +909,13 @@ static int netdev_open(struct net_device *dev)
printk(KERN_DEBUG "%s: Done netdev_open().\n", dev->name);
 
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, netdev_timer, (unsigned long)dev);
np->timer.expires = RUN_AT(3 * HZ);
-   np->timer.data = (unsigned long) dev;
-   np->timer.function = netdev_timer;
 
/* timer handler */
add_timer(>timer);
 
-   init_timer(>reset_timer);
-   np->reset_timer.data = (unsigned long) dev;
-   np->reset_timer.function = reset_timer;
+   setup_timer(>reset_timer, reset_timer, (unsigned long)dev);
np->reset_timer_armed = 0;
return rc;
 }
-- 
2.7.4

[PATCH 46/64] drivers: net: dmfe: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/dec/tulip/dmfe.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c 
b/drivers/net/ethernet/dec/tulip/dmfe.c
index 07e10a4..6585f73 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -596,10 +596,8 @@ static int dmfe_open(struct net_device *dev)
netif_wake_queue(dev);
 
/* set and active a timer process */
-   init_timer(>timer);
+   setup_timer(>timer, dmfe_timer, (unsigned long)dev);
db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
-   db->timer.data = (unsigned long)dev;
-   db->timer.function = dmfe_timer;
add_timer(>timer);
 
return 0;
-- 
2.7.4

[PATCH 47/64] drivers: net: bnxt: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index aacec8b..c25f5b5 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7190,9 +7190,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct 
net_device *dev)
 
bp->stats_coal_ticks = BNXT_DEF_STATS_COAL_TICKS;
 
-   init_timer(>timer);
-   bp->timer.data = (unsigned long)bp;
-   bp->timer.function = bnxt_timer;
+   setup_timer(>timer, bnxt_timer, (unsigned long)bp);
bp->current_interval = BNXT_TIMER_INTERVAL;
 
clear_bit(BNXT_STATE_OPEN, >state);
-- 
2.7.4

[PATCH 49/64] drivers: net: adi: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/adi/bfin_mac.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/adi/bfin_mac.c 
b/drivers/net/ethernet/adi/bfin_mac.c
index a251de8..0658cde 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1650,9 +1650,8 @@ static int bfin_mac_probe(struct platform_device *pdev)
ndev->netdev_ops = _mac_netdev_ops;
ndev->ethtool_ops = _mac_ethtool_ops;
 
-   init_timer(>tx_reclaim_timer);
-   lp->tx_reclaim_timer.data = (unsigned long)lp;
-   lp->tx_reclaim_timer.function = tx_reclaim_skb_timeout;
+   setup_timer(>tx_reclaim_timer, tx_reclaim_skb_timeout,
+   (unsigned long)lp);
 
lp->flags = 0;
netif_napi_add(ndev, >napi, bfin_mac_poll, CONFIG_BFIN_RX_DESC_NUM);
-- 
2.7.4

[PATCH 51/64] drivers: net: caif: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/caif/caif_hsi.c | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 438966b..fed75e7 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -1211,17 +1211,14 @@ static int cfhsi_open(struct net_device *ndev)
init_waitqueue_head(>flush_fifo_wait);
 
/* Setup the inactivity timer. */
-   init_timer(>inactivity_timer);
-   cfhsi->inactivity_timer.data = (unsigned long)cfhsi;
-   cfhsi->inactivity_timer.function = cfhsi_inactivity_tout;
+   setup_timer(>inactivity_timer, cfhsi_inactivity_tout,
+   (unsigned long)cfhsi);
/* Setup the slowpath RX timer. */
-   init_timer(>rx_slowpath_timer);
-   cfhsi->rx_slowpath_timer.data = (unsigned long)cfhsi;
-   cfhsi->rx_slowpath_timer.function = cfhsi_rx_slowpath;
+   setup_timer(>rx_slowpath_timer, cfhsi_rx_slowpath,
+   (unsigned long)cfhsi);
/* Setup the aggregation timer. */
-   init_timer(>aggregation_timer);
-   cfhsi->aggregation_timer.data = (unsigned long)cfhsi;
-   cfhsi->aggregation_timer.function = cfhsi_aggregation_tout;
+   setup_timer(>aggregation_timer, cfhsi_aggregation_tout,
+   (unsigned long)cfhsi);
 
/* Activate HSI interface. */
res = cfhsi->ops->cfhsi_up(cfhsi->ops);
-- 
2.7.4

[PATCH 52/64] drivers: net: appletalk: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/appletalk/ltpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index ac755d2..e4aa374 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1165,9 +1165,7 @@ struct net_device * __init ltpc_probe(void)
dev->irq = 0;
/* polled mode -- 20 times per second */
/* this is really, really slow... should it poll more often? */
-   init_timer(_timer);
-   ltpc_timer.function=ltpc_poll;
-   ltpc_timer.data = (unsigned long) dev;
+   setup_timer(_timer, ltpc_poll, (unsigned long)dev);
 
ltpc_timer.expires = jiffies + HZ/20;
add_timer(_timer);
-- 
2.7.4

[PATCH 54/64] drivers: net: hdlc_ppp: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/hdlc_ppp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 0d2e00e..c7721c7 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -610,9 +610,7 @@ static void ppp_start(struct net_device *dev)
for (i = 0; i < IDX_COUNT; i++) {
struct proto *proto = >protos[i];
proto->dev = dev;
-   init_timer(>timer);
-   proto->timer.function = ppp_timer;
-   proto->timer.data = (unsigned long)proto;
+   setup_timer(>timer, ppp_timer, (unsigned long)proto);
proto->state = CLOSED;
}
ppp->protos[IDX_LCP].pid = PID_LCP;
-- 
2.7.4

[PATCH 53/64] drivers: net: dscc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/dscc4.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index a043fb1..64f1764 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -1127,10 +1127,8 @@ static int dscc4_open(struct net_device *dev)
 done:
netif_start_queue(dev);
 
-init_timer(>timer);
+   setup_timer(>timer, dscc4_timer, (unsigned long)dev);
 dpriv->timer.expires = jiffies + 10*HZ;
-dpriv->timer.data = (unsigned long)dev;
-   dpriv->timer.function = dscc4_timer;
 add_timer(>timer);
netif_carrier_on(dev);
 
-- 
2.7.4

[PATCH 55/64] drivers: net: hamradio: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/hamradio/6pack.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 021a8ec..97fe8df 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -623,9 +623,7 @@ static int sixpack_open(struct tty_struct *tty)
 
netif_start_queue(dev);
 
-   init_timer(>tx_t);
-   sp->tx_t.function = sp_xmit_on_air;
-   sp->tx_t.data = (unsigned long) sp;
+   setup_timer(>tx_t, sp_xmit_on_air, (unsigned long)sp);
 
init_timer(>resync_t);
 
-- 
2.7.4

[PATCH 56/64] drivers: net: cpsw_ale: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/ti/cpsw_ale.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw_ale.c 
b/drivers/net/ethernet/ti/cpsw_ale.c
index ddd43e0..cd1185e 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -859,9 +859,7 @@ void cpsw_ale_start(struct cpsw_ale *ale)
cpsw_ale_control_set(ale, 0, ALE_ENABLE, 1);
cpsw_ale_control_set(ale, 0, ALE_CLEAR, 1);
 
-   init_timer(>timer);
-   ale->timer.data = (unsigned long)ale;
-   ale->timer.function = cpsw_ale_timer;
+   setup_timer(>timer, cpsw_ale_timer, (unsigned long)ale);
if (ale->ageout) {
ale->timer.expires = jiffies + ale->ageout;
add_timer(>timer);
-- 
2.7.4

[PATCH 57/64] drivers: net: stmmac: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1763e48..f41661a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2217,10 +2217,8 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv 
*priv)
 {
priv->tx_coal_frames = STMMAC_TX_FRAMES;
priv->tx_coal_timer = STMMAC_COAL_TX_TIMER;
-   init_timer(>txtimer);
+   setup_timer(>txtimer, stmmac_tx_timer, (unsigned long)priv);
priv->txtimer.expires = STMMAC_COAL_TIMER(priv->tx_coal_timer);
-   priv->txtimer.data = (unsigned long)priv;
-   priv->txtimer.function = stmmac_tx_timer;
add_timer(>txtimer);
 }
 
-- 
2.7.4

[PATCH 59/64] drivers: net: i40evf: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c 
b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 1825d95..c243f9d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2686,9 +2686,8 @@ static void i40evf_init_task(struct work_struct *work)
ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
}
 
-   init_timer(>watchdog_timer);
-   adapter->watchdog_timer.function = _watchdog_timer;
-   adapter->watchdog_timer.data = (unsigned long)adapter;
+   setup_timer(>watchdog_timer, _watchdog_timer,
+   (unsigned long)adapter);
mod_timer(>watchdog_timer, jiffies + 1);
 
adapter->tx_desc_count = I40EVF_DEFAULT_TXD;
-- 
2.7.4

[PATCH 62/64] drivers: net: cxgb: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/chelsio/cxgb/sge.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c 
b/drivers/net/ethernet/chelsio/cxgb/sge.c
index 0f13a7f..75e4399 100644
--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -2075,9 +2075,8 @@ struct sge *t1_sge_create(struct adapter *adapter, struct 
sge_params *p)
goto nomem_port;
}
 
-   init_timer(>tx_reclaim_timer);
-   sge->tx_reclaim_timer.data = (unsigned long)sge;
-   sge->tx_reclaim_timer.function = sge_tx_reclaim_cb;
+   setup_timer(>tx_reclaim_timer, sge_tx_reclaim_cb,
+   (unsigned long)sge);
 
if (is_T2(sge->adapter)) {
init_timer(>espibug_timer);
-- 
2.7.4

[PATCH 60/64] drivers: net: uli526x: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/dec/tulip/uli526x.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c 
b/drivers/net/ethernet/dec/tulip/uli526x.c
index 7fc248e..5fbbc0c 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -491,10 +491,8 @@ static int uli526x_open(struct net_device *dev)
netif_wake_queue(dev);
 
/* set and active a timer process */
-   init_timer(>timer);
+   setup_timer(>timer, uli526x_timer, (unsigned long)dev);
db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
-   db->timer.data = (unsigned long)dev;
-   db->timer.function = uli526x_timer;
add_timer(>timer);
 
return 0;
-- 
2.7.4

[PATCH 58/64] drivers: net: packetengines: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/packetengines/hamachi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/packetengines/hamachi.c 
b/drivers/net/ethernet/packetengines/hamachi.c
index 482b85e..77bc7cc 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -979,10 +979,8 @@ static int hamachi_open(struct net_device *dev)
   dev->name, readw(ioaddr + RxStatus), readw(ioaddr + 
TxStatus));
}
/* Set the timer to check for link beat. */
-   init_timer(>timer);
+   setup_timer(>timer, hamachi_timer, (unsigned long)dev);
hmp->timer.expires = RUN_AT((24*HZ)/10);/* 2.4 
sec. */
-   hmp->timer.data = (unsigned long)dev;
-   hmp->timer.function = hamachi_timer;/* 
timer handler */
add_timer(>timer);
 
return 0;
-- 
2.7.4

[PATCH 61/64] drivers: net: enic: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/cisco/enic/enic_clsf.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h 
b/drivers/net/ethernet/cisco/enic/enic_clsf.h
index 6aa9f89..4bfbf25 100644
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.h
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h
@@ -19,9 +19,8 @@ void enic_flow_may_expire(unsigned long data);
 
 static inline void enic_rfs_timer_start(struct enic *enic)
 {
-   init_timer(>rfs_h.rfs_may_expire);
-   enic->rfs_h.rfs_may_expire.function = enic_flow_may_expire;
-   enic->rfs_h.rfs_may_expire.data = (unsigned long)enic;
+   setup_timer(>rfs_h.rfs_may_expire, enic_flow_may_expire,
+   (unsigned long)enic);
mod_timer(>rfs_h.rfs_may_expire, jiffies + HZ/4);
 }
 
-- 
2.7.4

[PATCH 63/64] drivers: net: bnx2x: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c12b4d3..54d15713 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12414,10 +12414,8 @@ static int bnx2x_init_bp(struct bnx2x *bp)
 
bp->current_interval = CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ;
 
-   init_timer(>timer);
+   setup_timer(>timer, bnx2x_timer, (unsigned long)bp);
bp->timer.expires = jiffies + bp->current_interval;
-   bp->timer.data = (unsigned long) bp;
-   bp->timer.function = bnx2x_timer;
 
if (SHMEM2_HAS(bp, dcbx_lldp_params_offset) &&
SHMEM2_HAS(bp, dcbx_lldp_dcbx_stat_offset) &&
-- 
2.7.4

[PATCH 64/64] drivers: net: lmc: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/lmc/lmc_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 4698450..ae69d65 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1084,10 +1084,8 @@ static int lmc_open(struct net_device *dev)
  * Setup a timer for the watchdog on probe, and start it running.
  * Since lmc_ok == 0, it will be a NOP for now.
  */
-init_timer (>timer);
+setup_timer(>timer, lmc_watchdog, (unsigned long)dev);
 sc->timer.expires = jiffies + HZ;
-sc->timer.data = (unsigned long) dev;
-sc->timer.function = lmc_watchdog;
 add_timer (>timer);
 
 lmc_trace(dev, "lmc_open out");
-- 
2.7.4

[PATCH 50/64] drivers: net: can: sja1000: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/can/sja1000/peak_pcmcia.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/can/sja1000/peak_pcmcia.c 
b/drivers/net/can/sja1000/peak_pcmcia.c
index dd56133..4b8758e 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -692,9 +692,7 @@ static int pcan_probe(struct pcmcia_device *pdev)
}
 
/* init the timer which controls the leds */
-   init_timer(>led_timer);
-   card->led_timer.function = pcan_led_timer;
-   card->led_timer.data = (unsigned long)card;
+   setup_timer(>led_timer, pcan_led_timer, (unsigned long)card);
 
/* request the given irq */
err = request_irq(pdev->irq, _isr, IRQF_SHARED, PCC_NAME, card);
-- 
2.7.4

[PATCH 48/64] drivers: net: amd: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/a2065.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index e22f976..998d30e 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -733,10 +733,9 @@ static int a2065_init_one(struct zorro_dev *z,
dev->watchdog_timeo = 5*HZ;
dev->dma = 0;
 
-   init_timer(>multicast_timer);
-   priv->multicast_timer.data = (unsigned long) dev;
-   priv->multicast_timer.function =
-   (void (*)(unsigned long))lance_set_multicast;
+   setup_timer(>multicast_timer,
+   (void(*)(unsigned long))lance_set_multicast,
+   (unsigned long)dev);
 
err = register_netdev(dev);
if (err) {
-- 
2.7.4

[PATCH 30/64] drivers: net: qlogic: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/qlogic/qla3xxx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c 
b/drivers/net/ethernet/qlogic/qla3xxx.c
index 2991179..05479d4 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3891,10 +3891,8 @@ static int ql3xxx_probe(struct pci_dev *pdev,
INIT_DELAYED_WORK(>tx_timeout_work, ql_tx_timeout_work);
INIT_DELAYED_WORK(>link_state_work, ql_link_state_machine_work);
 
-   init_timer(>adapter_timer);
-   qdev->adapter_timer.function = ql3xxx_timer;
+   setup_timer(>adapter_timer, ql3xxx_timer, (unsigned long)qdev);
qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */
-   qdev->adapter_timer.data = (unsigned long)qdev;
 
if (!cards_found) {
pr_alert("%s\n", DRV_STRING);
-- 
2.7.4

[PATCH 09/64] drivers: net: et131x: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/agere/et131x.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/agere/et131x.c 
b/drivers/net/ethernet/agere/et131x.c
index 54eff90..658e92f 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3624,11 +3624,10 @@ static int et131x_open(struct net_device *netdev)
int result;
 
/* Start the timer to track NIC errors */
-   init_timer(>error_timer);
+   setup_timer(>error_timer, et131x_error_timer_handler,
+   (unsigned long)adapter);
adapter->error_timer.expires = jiffies +
msecs_to_jiffies(TX_ERROR_PERIOD);
-   adapter->error_timer.function = et131x_error_timer_handler;
-   adapter->error_timer.data = (unsigned long)adapter;
add_timer(>error_timer);
 
result = request_irq(irq, et131x_isr,
-- 
2.7.4

[PATCH 06/64] drivers: net: bcm63xx: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 4f3845a..f8f 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1857,9 +1857,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
spin_lock_init(>rx_lock);
 
/* init rx timeout (used for oom) */
-   init_timer(>rx_timeout);
-   priv->rx_timeout.function = bcm_enet_refill_rx_timer;
-   priv->rx_timeout.data = (unsigned long)dev;
+   setup_timer(>rx_timeout, bcm_enet_refill_rx_timer,
+   (unsigned long)dev);
 
/* init the mib update lock */
mutex_init(>mib_update_lock);
-- 
2.7.4

[PATCH 08/64] drivers: net: am79c961: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/amd/am79c961a.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/am79c961a.c 
b/drivers/net/ethernet/amd/am79c961a.c
index b11e910..0612dbe 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -728,9 +728,7 @@ static int am79c961_probe(struct platform_device *pdev)
am79c961_banner();
 
spin_lock_init(>chip_lock);
-   init_timer(>timer);
-   priv->timer.data = (unsigned long)dev;
-   priv->timer.function = am79c961_timer;
+   setup_timer(>timer, am79c961_timer, (unsigned long)dev);
 
if (am79c961_hw_init(dev))
goto release;
-- 
2.7.4

[PATCH 04/64] drivers: net: brcm80211: use setup_timer() helper.

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index aaed4ab..ab3f223 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3260,9 +3260,8 @@ static void brcmf_init_escan(struct brcmf_cfg80211_info 
*cfg)
brcmf_cfg80211_escan_handler);
cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
/* Init scan_timeout timer */
-   init_timer(>escan_timeout);
-   cfg->escan_timeout.data = (unsigned long) cfg;
-   cfg->escan_timeout.function = brcmf_escan_timeout;
+   setup_timer(>escan_timeout, brcmf_escan_timeout,
+   (unsigned long)cfg);
INIT_WORK(>escan_timeout_work,
  brcmf_cfg80211_escan_timeout_worker);
 }
-- 
2.7.4

[PATCH 1/1] net: ti: netcp: use setup_timer

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/ti/netcp_ethss.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/netcp_ethss.c 
b/drivers/net/ethernet/ti/netcp_ethss.c
index 28cb38a..4ad8216 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -3616,9 +3616,8 @@ static int gbe_probe(struct netcp_device *netcp_device, 
struct device *dev,
}
spin_unlock_bh(_dev->hw_stats_lock);
 
-   init_timer(_dev->timer);
-   gbe_dev->timer.data  = (unsigned long)gbe_dev;
-   gbe_dev->timer.function = netcp_ethss_timer;
+   setup_timer(_dev->timer, netcp_ethss_timer,
+   (unsigned long)gbe_dev);
gbe_dev->timer.expires   = jiffies + GBE_TIMER_INTERVAL;
add_timer(_dev->timer);
*inst_priv = gbe_dev;
-- 
2.7.4

[PATCH 1/1] net: usb: catc: use setup_timer() helper

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/usb/catc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index dbc9031..aeb62e1 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -805,9 +805,7 @@ static int catc_probe(struct usb_interface *intf, const 
struct usb_device_id *id
spin_lock_init(>tx_lock);
spin_lock_init(>ctrl_lock);
 
-   init_timer(>timer);
-   catc->timer.data = (long) catc;
-   catc->timer.function = catc_stats_timer;
+   setup_timer(>timer, catc_stats_timer, (long)catc);
 
catc->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
catc->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-- 
2.7.4

[PATCH 1/1] net: wan : hdlc: use setup_timer() helper

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/wan/hdlc_fr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 78596e4..425a47f 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1003,11 +1003,10 @@ static void fr_start(struct net_device *dev)
state(hdlc)->n391cnt = 0;
state(hdlc)->txseq = state(hdlc)->rxseq = 0;
 
-   init_timer((hdlc)->timer);
+   setup_timer((hdlc)->timer, fr_timer,
+   (unsigned long)dev);
/* First poll after 1 s */
state(hdlc)->timer.expires = jiffies + HZ;
-   state(hdlc)->timer.function = fr_timer;
-   state(hdlc)->timer.data = (unsigned long)dev;
add_timer((hdlc)->timer);
} else
fr_set_link_state(1, dev);
-- 
2.7.4

[PATCH 1/1] net:nfc: use setup_timer

[Allen Pais]

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

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 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(>check_pres_timer);
-   dev->check_pres_timer.data = (unsigned long)dev;
-   dev->check_pres_timer.function = nfc_check_pres_timeout;
+   setup_timer(>check_pres_timer, nfc_check_pres_timeout,
+   (unsigned long)dev);
 
INIT_WORK(>check_pres_work, nfc_check_pres_work);
}
-- 
2.7.4

[PATCH 03/10] driver:gpu: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/gpu/drm/gma500/mid_bios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/gma500/mid_bios.c 
b/drivers/gpu/drm/gma500/mid_bios.c
index d75ecb3..1fa1633 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -237,7 +237,7 @@ static int mid_get_vbt_data_r10(struct drm_psb_private 
*dev_priv, u32 addr)
 
gct = kmalloc(sizeof(*gct) * vbt.panel_count, GFP_KERNEL);
if (!gct)
-   return -1;
+   return -ENOMEM;
 
gct_virtual = ioremap(addr + sizeof(vbt),
sizeof(*gct) * vbt.panel_count);
-- 
2.7.4

[PATCH 05/10] drivers:net: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/bonding/bond_alb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index c02cc81..89df377 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -864,7 +864,7 @@ static int rlb_initialize(struct bonding *bond)
 
new_hashtbl = kmalloc(size, GFP_KERNEL);
if (!new_hashtbl)
-   return -1;
+   return -ENOMEM;
 
spin_lock_bh(>mode_lock);
 
-- 
2.7.4

[PATCH 06/10] drivers:ethernet: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sun/cassini.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sun/cassini.c 
b/drivers/net/ethernet/sun/cassini.c
index 382993c..fc0ea3a 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -3984,7 +3984,7 @@ static inline int cas_alloc_rx_desc(struct cas *cp, int 
ring)
size = RX_DESC_RINGN_SIZE(ring);
for (i = 0; i < size; i++) {
if ((page[i] = cas_page_alloc(cp, GFP_KERNEL)) == NULL)
-   return -1;
+   return -ENOMEM;
}
return 0;
 }
-- 
2.7.4

[PATCH 07/10] driver:megaraid: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/scsi/megaraid/megaraid_mbox.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c 
b/drivers/scsi/megaraid/megaraid_mbox.c
index ec3c438..b09a0a6 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -724,8 +724,8 @@ megaraid_init_mbox(adapter_t *adapter)
 * controllers
 */
raid_dev = kzalloc(sizeof(mraid_device_t), GFP_KERNEL);
-   if (raid_dev == NULL) return -1;
-
+   if (!raid_dev)
+   return -ENOMEM;
 
/*
 * Attach the adapter soft state to raid device soft state
-- 
2.7.4

[PATCH 10/10] fs:btrfs: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 fs/btrfs/check-integrity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 7d5a9b5..efa4c23 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2913,7 +2913,7 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info,
state = kvzalloc(sizeof(*state), GFP_KERNEL);
if (!state) {
pr_info("btrfs check-integrity: allocation failed!\n");
-   return -1;
+   return -ENOMEM;
}
 
if (!btrfsic_is_initialized) {
-- 
2.7.4

[PATCH 08/10] driver:cxgbit: return -NOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/target/iscsi/cxgbit/cxgbit_target.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_target.c 
b/drivers/target/iscsi/cxgbit/cxgbit_target.c
index 514986b..47127d6 100644
--- a/drivers/target/iscsi/cxgbit/cxgbit_target.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_target.c
@@ -399,7 +399,7 @@ cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, 
u32 data_offset,
if (padding) {
page = alloc_page(GFP_KERNEL | __GFP_ZERO);
if (!page)
-   return -1;
+   return -ENOMEM;
skb_fill_page_desc(skb, i, page, 0, padding);
skb->data_len += padding;
skb->len += padding;
-- 
2.7.4

[PATCH 04/10] drivers:mpt: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/message/fusion/mptbase.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 84eab28..7920b2b 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -4328,15 +4328,15 @@ initChainBuffers(MPT_ADAPTER *ioc)
if (ioc->ReqToChain == NULL) {
sz = ioc->req_depth * sizeof(int);
mem = kmalloc(sz, GFP_ATOMIC);
-   if (mem == NULL)
-   return -1;
+   if (!mem)
+   return -ENOMEM;
 
ioc->ReqToChain = (int *) mem;
dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ReqToChain alloc  @ 
%p, sz=%d bytes\n",
ioc->name, mem, sz));
mem = kmalloc(sz, GFP_ATOMIC);
-   if (mem == NULL)
-   return -1;
+   if (!mem)
+   return -ENOMEM;
 
ioc->RequestNB = (int *) mem;
dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "RequestNB alloc  @ 
%p, sz=%d bytes\n",
@@ -4402,8 +4402,8 @@ initChainBuffers(MPT_ADAPTER *ioc)
sz = num_chain * sizeof(int);
if (ioc->ChainToChain == NULL) {
mem = kmalloc(sz, GFP_ATOMIC);
-   if (mem == NULL)
-   return -1;
+   if (!mem)
+   return -ENOMEM;
 
ioc->ChainToChain = (int *) mem;
dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ChainToChain alloc @ 
%p, sz=%d bytes\n",
-- 
2.7.4

[PATCH 09/10] driver:video: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c 
b/drivers/video/fbdev/matrox/matroxfb_base.c
index f6a0b9a..5cd238d 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -2058,7 +2058,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const 
struct pci_device_id* dumm
 
minfo = kzalloc(sizeof(*minfo), GFP_KERNEL);
if (!minfo)
-   return -1;
+   return -ENOMEM;
 
minfo->pcidev = pdev;
minfo->dead = 0;
-- 
2.7.4

[PATCH 02/10] drivers:crypto: return -ENOMEM on allocation failure.

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/crypto/omap-aes-gcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/omap-aes-gcm.c b/drivers/crypto/omap-aes-gcm.c
index 7d4f8a4..2542224 100644
--- a/drivers/crypto/omap-aes-gcm.c
+++ b/drivers/crypto/omap-aes-gcm.c
@@ -186,7 +186,7 @@ static int do_encrypt_iv(struct aead_request *req, u32 
*tag, u32 *iv)
sk_req = skcipher_request_alloc(ctx->ctr, GFP_KERNEL);
if (!sk_req) {
pr_err("skcipher: Failed to allocate request\n");
-   return -1;
+   return -ENOMEM;
}
 
init_completion();
-- 
2.7.4

[PATCH 01/10] arch:powerpc: return -ENOMEM on failed allocation

[Allen Pais]

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 arch/powerpc/platforms/cell/spider-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spider-pci.c 
b/arch/powerpc/platforms/cell/spider-pci.c
index d1e61e2..82aa3f7 100644
--- a/arch/powerpc/platforms/cell/spider-pci.c
+++ b/arch/powerpc/platforms/cell/spider-pci.c
@@ -106,7 +106,7 @@ static int __init spiderpci_pci_setup_chip(struct 
pci_controller *phb,
dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!dummy_page_va) {
pr_err("SPIDERPCI-IOWA:Alloc dummy_page_va failed.\n");
-   return -1;
+   return -ENOMEM;
}
 
dummy_page_da = dma_map_single(phb->parent, dummy_page_va,
@@ -137,7 +137,7 @@ int __init spiderpci_iowa_init(struct iowa_bus *bus, void 
*data)
if (!priv) {
pr_err("SPIDERPCI-IOWA:"
   "Can't allocate struct spiderpci_iowa_private");
-   return -1;
+   return -ENOMEM;
}
 
if (of_address_to_resource(np, 0, )) {
-- 
2.7.4