diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-23 03:40:42 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2017-11-21 19:35:54 -0500 |
commit | 841b86f3289dbe858daeceec36423d4ea286fac2 (patch) | |
tree | 332a53d6045914798e364a534fe3a47cab56d803 /net/atm/lec.c | |
parent | 919b250f8570618e84af544c3e18dad5210eb9b6 (diff) |
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
With all callbacks converted, and the timer callback prototype
switched over, the TIMER_FUNC_TYPE cast is no longer needed,
so remove it. Conversion was done with the following scripts:
perl -pi -e 's|\(TIMER_FUNC_TYPE\)||g' \
$(git grep TIMER_FUNC_TYPE | cut -d: -f1 | sort -u)
perl -pi -e 's|\(TIMER_DATA_TYPE\)||g' \
$(git grep TIMER_DATA_TYPE | cut -d: -f1 | sort -u)
The now unused macros are also dropped from include/linux/timer.h.
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r-- | net/atm/lec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index c976196da3ea..6676e3433261 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -1798,7 +1798,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv, | |||
1798 | else | 1798 | else |
1799 | send_to_lecd(priv, l_arp_xmt, mac_to_find, NULL, NULL); | 1799 | send_to_lecd(priv, l_arp_xmt, mac_to_find, NULL, NULL); |
1800 | entry->timer.expires = jiffies + (1 * HZ); | 1800 | entry->timer.expires = jiffies + (1 * HZ); |
1801 | entry->timer.function = (TIMER_FUNC_TYPE)lec_arp_expire_arp; | 1801 | entry->timer.function = lec_arp_expire_arp; |
1802 | add_timer(&entry->timer); | 1802 | add_timer(&entry->timer); |
1803 | found = priv->mcast_vcc; | 1803 | found = priv->mcast_vcc; |
1804 | } | 1804 | } |
@@ -1998,7 +1998,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data, | |||
1998 | entry->old_recv_push = old_push; | 1998 | entry->old_recv_push = old_push; |
1999 | entry->status = ESI_UNKNOWN; | 1999 | entry->status = ESI_UNKNOWN; |
2000 | entry->timer.expires = jiffies + priv->vcc_timeout_period; | 2000 | entry->timer.expires = jiffies + priv->vcc_timeout_period; |
2001 | entry->timer.function = (TIMER_FUNC_TYPE)lec_arp_expire_vcc; | 2001 | entry->timer.function = lec_arp_expire_vcc; |
2002 | hlist_add_head(&entry->next, &priv->lec_no_forward); | 2002 | hlist_add_head(&entry->next, &priv->lec_no_forward); |
2003 | add_timer(&entry->timer); | 2003 | add_timer(&entry->timer); |
2004 | dump_arp_table(priv); | 2004 | dump_arp_table(priv); |
@@ -2082,7 +2082,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data, | |||
2082 | entry->status = ESI_UNKNOWN; | 2082 | entry->status = ESI_UNKNOWN; |
2083 | hlist_add_head(&entry->next, &priv->lec_arp_empty_ones); | 2083 | hlist_add_head(&entry->next, &priv->lec_arp_empty_ones); |
2084 | entry->timer.expires = jiffies + priv->vcc_timeout_period; | 2084 | entry->timer.expires = jiffies + priv->vcc_timeout_period; |
2085 | entry->timer.function = (TIMER_FUNC_TYPE)lec_arp_expire_vcc; | 2085 | entry->timer.function = lec_arp_expire_vcc; |
2086 | add_timer(&entry->timer); | 2086 | add_timer(&entry->timer); |
2087 | pr_debug("After vcc was added\n"); | 2087 | pr_debug("After vcc was added\n"); |
2088 | dump_arp_table(priv); | 2088 | dump_arp_table(priv); |