timer: Remove init_timer_deferrable() in favor of timer_setup()

This refactors the only users of init_timer_deferrable() to use
the new timer_setup() and from_timer(). Removes definition of
init_timer_deferrable().

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David S. Miller <davem@davemloft.net> # for networking parts
Acked-by: Sebastian Reichel <sre@kernel.org> # for drivers/hsi parts
Cc: linux-mips@linux-mips.org
Cc: Petr Mladek <pmladek@suse.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: linux1394-devel@lists.sourceforge.net
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: linux-s390@vger.kernel.org
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ursula Braun <ubraun@linux.vnet.ibm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Harish Patil <harish.patil@cavium.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Manish Chopra <manish.chopra@cavium.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-pm@vger.kernel.org
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Mark Gross <mark.gross@intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-wireless@vger.kernel.org
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Michael Reed <mdr@sgi.com>
Cc: netdev@vger.kernel.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lkml.kernel.org/r/1507159627-127660-6-git-send-email-keescook@chromium.org

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b95c584ce19d33b658a9a546ecb3de64ff93d23a..f9b6107d685447ba99dd5d0bdfa9c65c5a0d249f 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1453,7 +1453,7 @@ static void topology_schedule_update(void)
        schedule_work(&topology_work);
 }
 
-static void topology_timer_fn(unsigned long ignored)
+static void topology_timer_fn(struct timer_list *unused)
 {
        if (prrn_enabled && cpumask_weight(&cpu_associativity_changes_mask))
                topology_schedule_update();
@@ -1463,14 +1463,11 @@ static void topology_timer_fn(unsigned long ignored)
                reset_topology_timer();
        }
 }
-static struct timer_list topology_timer =
-       TIMER_INITIALIZER(topology_timer_fn, 0, 0);
+static struct timer_list topology_timer;
 
 static void reset_topology_timer(void)
 {
-       topology_timer.data = 0;
-       topology_timer.expires = jiffies + 60 * HZ;
-       mod_timer(&topology_timer, topology_timer.expires);
+       mod_timer(&topology_timer, jiffies + 60 * HZ);
 }
 
 #ifdef CONFIG_SMP
@@ -1530,7 +1527,8 @@ int start_topology_update(void)
                        prrn_enabled = 0;
                        vphn_enabled = 1;
                        setup_cpu_associativity_change_counters();
-                       init_timer_deferrable(&topology_timer);
+                       timer_setup(&topology_timer, topology_timer_fn,
+                                   TIMER_DEFERRABLE);
                        reset_topology_timer();
                }
        }

diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 93d28c0ec8bf0ef867bc958592c58f60d3ce2913..67af03d3aeb36e2afd489e9cf122d77db0a488b8 100644 (file)
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -464,10 +464,10 @@ static void ssip_error(struct hsi_client *cl)
        hsi_async_read(cl, msg);
 }
 
-static void ssip_keep_alive(unsigned long data)
+static void ssip_keep_alive(struct timer_list *t)
 {
-       struct hsi_client *cl = (struct hsi_client *)data;
-       struct ssi_protocol *ssi = hsi_client_drvdata(cl);
+       struct ssi_protocol *ssi = from_timer(ssi, t, keep_alive);
+       struct hsi_client *cl = ssi->cl;
 
        dev_dbg(&cl->device, "Keep alive kick in: m(%d) r(%d) s(%d)\n",
                ssi->main_state, ssi->recv_state, ssi->send_state);
@@ -490,9 +490,19 @@ static void ssip_keep_alive(unsigned long data)
        spin_unlock(&ssi->lock);
 }
 
-static void ssip_wd(unsigned long data)
+static void ssip_rx_wd(struct timer_list *t)
+{
+       struct ssi_protocol *ssi = from_timer(ssi, t, rx_wd);
+       struct hsi_client *cl = ssi->cl;
+
+       dev_err(&cl->device, "Watchdog trigerred\n");
+       ssip_error(cl);
+}
+
+static void ssip_tx_wd(unsigned long data)
 {
-       struct hsi_client *cl = (struct hsi_client *)data;
+       struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd);
+       struct hsi_client *cl = ssi->cl;
 
        dev_err(&cl->device, "Watchdog trigerred\n");
        ssip_error(cl);
@@ -1084,15 +1094,9 @@ static int ssi_protocol_probe(struct device *dev)
        }
 
        spin_lock_init(&ssi->lock);
-       init_timer_deferrable(&ssi->rx_wd);
-       init_timer_deferrable(&ssi->tx_wd);
-       init_timer(&ssi->keep_alive);
-       ssi->rx_wd.data = (unsigned long)cl;
-       ssi->rx_wd.function = ssip_wd;
-       ssi->tx_wd.data = (unsigned long)cl;
-       ssi->tx_wd.function = ssip_wd;
-       ssi->keep_alive.data = (unsigned long)cl;
-       ssi->keep_alive.function = ssip_keep_alive;
+       timer_setup(&ssi->rx_wd, ssip_rx_wd, TIMER_DEFERRABLE);
+       timer_setup(&ssi->tx_wd, ssip_tx_wd, TIMER_DEFERRABLE);
+       timer_setup(&ssi->keep_alive, ssip_keep_alive, 0);
        INIT_LIST_HEAD(&ssi->txqueue);
        INIT_LIST_HEAD(&ssi->cmdqueue);
        atomic_set(&ssi->tx_usecnt, 0);

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 9feec70094435e19ee039f18ea430291d9f7d1a0..29fea74bff2e6793a0305ef154a73886f1d2a82b 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4725,9 +4725,9 @@ static const struct net_device_ops qlge_netdev_ops = {
        .ndo_vlan_rx_kill_vid   = qlge_vlan_rx_kill_vid,
 };
 
-static void ql_timer(unsigned long data)
+static void ql_timer(struct timer_list *t)
 {
-       struct ql_adapter *qdev = (struct ql_adapter *)data;
+       struct ql_adapter *qdev = from_timer(qdev, t, timer);
        u32 var = 0;
 
        var = ql_read32(qdev, STS);
@@ -4806,11 +4806,8 @@ static int qlge_probe(struct pci_dev *pdev,
        /* Start up the timer to trigger EEH if
         * the bus goes dead
         */
-       init_timer_deferrable(&qdev->timer);
-       qdev->timer.data = (unsigned long)qdev;
-       qdev->timer.function = ql_timer;
-       qdev->timer.expires = jiffies + (5*HZ);
-       add_timer(&qdev->timer);
+       timer_setup(&qdev->timer, ql_timer, TIMER_DEFERRABLE);
+       mod_timer(&qdev->timer, jiffies + (5*HZ));
        ql_link_off(qdev);
        ql_display_dev_info(ndev);
        atomic_set(&qdev->lb_count, 0);

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index d7c49cf1d5e91e2f962d499c4b88df87eec6dacd..3247d2feda07f8a671fe32aa45225cfbd34c50ff 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2325,9 +2325,9 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 /* Walk the forwarding table and purge stale entries */
-static void vxlan_cleanup(unsigned long arg)
+static void vxlan_cleanup(struct timer_list *t)
 {
-       struct vxlan_dev *vxlan = (struct vxlan_dev *) arg;
+       struct vxlan_dev *vxlan = from_timer(vxlan, t, age_timer);
        unsigned long next_timer = jiffies + FDB_AGE_INTERVAL;
        unsigned int h;
 
@@ -2647,9 +2647,7 @@ static void vxlan_setup(struct net_device *dev)
        INIT_LIST_HEAD(&vxlan->next);
        spin_lock_init(&vxlan->hash_lock);
 
-       init_timer_deferrable(&vxlan->age_timer);
-       vxlan->age_timer.function = vxlan_cleanup;
-       vxlan->age_timer.data = (unsigned long) vxlan;
+       timer_setup(&vxlan->age_timer, vxlan_cleanup, TIMER_DEFERRABLE);
 
        vxlan->dev = dev;
 

diff --git a/drivers/net/wireless/ath/ath6kl/recovery.c b/drivers/net/wireless/ath/ath6kl/recovery.c
index 3a8d5e97dc8efecf4907f8d1a2fbc99e7be697f5..c09e40c9010ff0339f0f0e672151e0905133a7e8 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/recovery.c
+++ b/drivers/net/wireless/ath/ath6kl/recovery.c
@@ -60,9 +60,9 @@ void ath6kl_recovery_hb_event(struct ath6kl *ar, u32 cookie)
                ar->fw_recovery.hb_pending = false;
 }
 
-static void ath6kl_recovery_hb_timer(unsigned long data)
+static void ath6kl_recovery_hb_timer(struct timer_list *t)
 {
-       struct ath6kl *ar = (struct ath6kl *) data;
+       struct ath6kl *ar = from_timer(ar, t, fw_recovery.hb_timer);
        int err;
 
        if (test_bit(RECOVERY_CLEANUP, &ar->flag) ||
@@ -104,9 +104,8 @@ void ath6kl_recovery_init(struct ath6kl *ar)
        recovery->seq_num = 0;
        recovery->hb_misscnt = 0;
        ar->fw_recovery.hb_pending = false;
-       ar->fw_recovery.hb_timer.function = ath6kl_recovery_hb_timer;
-       ar->fw_recovery.hb_timer.data = (unsigned long) ar;
-       init_timer_deferrable(&ar->fw_recovery.hb_timer);
+       timer_setup(&ar->fw_recovery.hb_timer, ath6kl_recovery_hb_timer,
+                   TIMER_DEFERRABLE);
 
        if (ar->fw_recovery.hb_poll)
                mod_timer(&ar->fw_recovery.hb_timer, jiffies +

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 9da903562ed4547463031212946d3035fca3a014..10cc45ca58035d60fa4cde4664322b0535587e27 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -128,8 +128,6 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 
 #define init_timer(timer)                                              \
        __init_timer((timer), 0)
-#define init_timer_deferrable(timer)                                   \
-       __init_timer((timer), TIMER_DEFERRABLE)
 
 #define __setup_timer(_timer, _fn, _data, _flags)                      \
        do {                                                            \