net: ksz884x: 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: "David S. Miller" <davem@davemloft.net>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.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>

diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index e798fbe086001acc3b4e36a6970058b5c6fda078..52207508744cafbf8243533b35ab99d9e70567d0 100644 (file)
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -4338,11 +4338,11 @@ static void ksz_stop_timer(struct ksz_timer_info *info)
 }
 
 static void ksz_init_timer(struct ksz_timer_info *info, int period,
-       void (*function)(unsigned long), void *data)
+       void (*function)(struct timer_list *))
 {
        info->max = 0;
        info->period = period;
-       setup_timer(&info->timer, function, (unsigned long)data);
+       timer_setup(&info->timer, function, 0);
 }
 
 static void ksz_update_timer(struct ksz_timer_info *info)
@@ -6689,9 +6689,9 @@ static void mib_read_work(struct work_struct *work)
        }
 }
 
-static void mib_monitor(unsigned long ptr)
+static void mib_monitor(struct timer_list *t)
 {
-       struct dev_info *hw_priv = (struct dev_info *) ptr;
+       struct dev_info *hw_priv = from_timer(hw_priv, t, mib_timer_info.timer);
 
        mib_read_work(&hw_priv->mib_read);
 
@@ -6716,10 +6716,10 @@ static void mib_monitor(unsigned long ptr)
  *
  * This routine is run in a kernel timer to monitor the network device.
  */
-static void dev_monitor(unsigned long ptr)
+static void dev_monitor(struct timer_list *t)
 {
-       struct net_device *dev = (struct net_device *) ptr;
-       struct dev_priv *priv = netdev_priv(dev);
+       struct dev_priv *priv = from_timer(priv, t, monitor_timer_info.timer);
+       struct net_device *dev = priv->mii_if.dev;
        struct dev_info *hw_priv = priv->adapter;
        struct ksz_hw *hw = &hw_priv->hw;
        struct ksz_port *port = &priv->port;
@@ -6789,7 +6789,7 @@ static int __init netdev_init(struct net_device *dev)
 
        /* 500 ms timeout */
        ksz_init_timer(&priv->monitor_timer_info, 500 * HZ / 1000,
-               dev_monitor, dev);
+               dev_monitor);
 
        /* 500 ms timeout */
        dev->watchdog_timeo = HZ / 2;
@@ -7065,7 +7065,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
 
        /* 500 ms timeout */
        ksz_init_timer(&hw_priv->mib_timer_info, 500 * HZ / 1000,
-               mib_monitor, hw_priv);
+               mib_monitor);
 
        for (i = 0; i < hw->dev_count; i++) {
                dev = alloc_etherdev(sizeof(struct dev_priv));