Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sun/cassini.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/sun/cassini.c 
b/drivers/net/ethernet/sun/cassini.c
index 382993c..a74d78f 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -5039,10 +5039,7 @@ static int cas_init_one(struct pci_dev *pdev, const 
struct pci_device_id *ent)
        spin_lock_init(&cp->stat_lock[N_TX_RINGS]);
        mutex_init(&cp->pm_mutex);
 
-       init_timer(&cp->link_timer);
-       cp->link_timer.function = cas_link_timer;
-       cp->link_timer.data = (unsigned long) cp;
-
+       setup_timer(&cp->link_timer, cas_link_timer, (unsigned long)cp);
 #if 1
        /* Just in case the implementation of atomic operations
         * change so that an explicit initialization is necessary.
-- 
2.7.4

Reply via email to