hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/net: wan/sdla: Convert timers to use timer_setup() 

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: Allen Pais <allen.lkml@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tobias Klauser <tklauser@distanz.ch>
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-25 03:53:59 -07:00 committed by David S. Miller
parent 605ea2f935
commit 032cfd66af
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wan/sdla.c
View File

@ -927,13 +927,10 @@ static irqreturn_t sdla_isr(int dummy, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void sdla_poll(unsigned long device) static void sdla_poll(struct timer_list *t)
{ {
struct net_device *dev; struct frad_local *flp = from_timer(flp, t, timer);
struct frad_local *flp; struct net_device *dev = flp->dev;
dev = (struct net_device *) device;
flp = netdev_priv(dev);
if (sdla_byte(dev, SDLA_502_RCV_BUF)) if (sdla_byte(dev, SDLA_502_RCV_BUF))
sdla_receive(dev); sdla_receive(dev);
@ -1616,8 +1613,9 @@ static void setup_sdla(struct net_device *dev)
flp->assoc = sdla_assoc; flp->assoc = sdla_assoc;
flp->deassoc = sdla_deassoc; flp->deassoc = sdla_deassoc;
flp->dlci_conf = sdla_dlci_conf; flp->dlci_conf = sdla_dlci_conf;
flp->dev = dev;
setup_timer(&flp->timer, sdla_poll, (unsigned long)dev); timer_setup(&flp->timer, sdla_poll, 0);
flp->timer.expires = 1; flp->timer.expires = 1;
} }

1
include/linux/if_frad.h
View File

@ -83,6 +83,7 @@ struct frad_local
/* fields that are used by the Sangoma SDLA cards */ /* fields that are used by the Sangoma SDLA cards */
struct timer_list timer; struct timer_list timer;
struct net_device *dev;
int type; /* adapter type */ int type; /* adapter type */
int state; /* state of the S502/8 control latch */ int state; /* state of the S502/8 control latch */
int buffer; /* current buffer for S508 firmware */ int buffer; /* current buffer for S508 firmware */