leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: amd8111e: Convert timers to use timer_setup()

Browse Source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Philippe Reynes <tremyfr@gmail.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-16 17:29:09 -07:00 committed by David S. Miller
parent cacd2b3fb9
commit 495ad9864f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/amd/amd8111e.c
View File

@ -1669,9 +1669,9 @@ static int amd8111e_resume(struct pci_dev *pci_dev)
return 0; return 0;
} }
static void amd8111e_config_ipg(struct net_device *dev) static void amd8111e_config_ipg(struct timer_list *t)
{ {
struct amd8111e_priv *lp = netdev_priv(dev); struct amd8111e_priv *lp = from_timer(lp, t, ipg_data.ipg_timer);
struct ipg_info *ipg_data = &lp->ipg_data; struct ipg_info *ipg_data = &lp->ipg_data;
void __iomem *mmio = lp->mmio; void __iomem *mmio = lp->mmio;
unsigned int prev_col_cnt = ipg_data->col_cnt; unsigned int prev_col_cnt = ipg_data->col_cnt;
@ -1883,8 +1883,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
/* Initialize software ipg timer */ /* Initialize software ipg timer */
if(lp->options & OPTION_DYN_IPG_ENABLE){ if(lp->options & OPTION_DYN_IPG_ENABLE){
setup_timer(&lp->ipg_data.ipg_timer, timer_setup(&lp->ipg_data.ipg_timer, amd8111e_config_ipg, 0);
(void *)&amd8111e_config_ipg, (unsigned long)dev);
lp->ipg_data.ipg_timer.expires = jiffies + lp->ipg_data.ipg_timer.expires = jiffies +
IPG_CONVERGE_JIFFIES; IPG_CONVERGE_JIFFIES;
lp->ipg_data.ipg = DEFAULT_IPG; lp->ipg_data.ipg = DEFAULT_IPG;