* [PATCH] drivers/net: dlink: Convert timers to use timer_setup()
@ 2017-10-27 5:54 Kees Cook
2017-10-27 10:44 ` Denis Kirjanov
2017-10-28 10:21 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2017-10-27 5:54 UTC (permalink / raw)
To: David S. Miller; +Cc: Denis Kirjanov, netdev, linux-kernel
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: Denis Kirjanov <kda@linux-powerpc.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/net/ethernet/dlink/sundance.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 6ca9e981ad57..1a27176381fb 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -431,7 +431,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
static int mdio_wait_link(struct net_device *dev, int wait);
static int netdev_open(struct net_device *dev);
static void check_duplex(struct net_device *dev);
-static void netdev_timer(unsigned long data);
+static void netdev_timer(struct timer_list *t);
static void tx_timeout(struct net_device *dev);
static void init_ring(struct net_device *dev);
static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);
@@ -913,7 +913,7 @@ static int netdev_open(struct net_device *dev)
ioread16(ioaddr + MACCtrl1), ioread16(ioaddr + MACCtrl0));
/* Set the timer to check for link beat. */
- setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
+ timer_setup(&np->timer, netdev_timer, 0);
np->timer.expires = jiffies + 3*HZ;
add_timer(&np->timer);
@@ -951,10 +951,10 @@ static void check_duplex(struct net_device *dev)
}
}
-static void netdev_timer(unsigned long data)
+static void netdev_timer(struct timer_list *t)
{
- struct net_device *dev = (struct net_device *)data;
- struct netdev_private *np = netdev_priv(dev);
+ struct netdev_private *np = from_timer(np, t, timer);
+ struct net_device *dev = np->mii_if.dev;
void __iomem *ioaddr = np->base;
int next_tick = 10*HZ;
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drivers/net: dlink: Convert timers to use timer_setup()
2017-10-27 5:54 [PATCH] drivers/net: dlink: Convert timers to use timer_setup() Kees Cook
@ 2017-10-27 10:44 ` Denis Kirjanov
2017-10-28 10:21 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Denis Kirjanov @ 2017-10-27 10:44 UTC (permalink / raw)
To: Kees Cook; +Cc: David S. Miller, netdev, linux-kernel
On 10/27/17, Kees Cook <keescook@chromium.org> wrote:
> 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: Denis Kirjanov <kda@linux-powerpc.org>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Denis Kirjanov <kda@linux-powerpc.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drivers/net: dlink: Convert timers to use timer_setup()
2017-10-27 5:54 [PATCH] drivers/net: dlink: Convert timers to use timer_setup() Kees Cook
2017-10-27 10:44 ` Denis Kirjanov
@ 2017-10-28 10:21 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-10-28 10:21 UTC (permalink / raw)
To: keescook; +Cc: kda, netdev, linux-kernel
From: Kees Cook <keescook@chromium.org>
Date: Thu, 26 Oct 2017 22:54:59 -0700
> 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: Denis Kirjanov <kda@linux-powerpc.org>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-28 10:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-27 5:54 [PATCH] drivers/net: dlink: Convert timers to use timer_setup() Kees Cook
2017-10-27 10:44 ` Denis Kirjanov
2017-10-28 10:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).