lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 47/58] net/ethernet/sgi: Convert timers to use timer_setup()
    Date
    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: Ralf Baechle <ralf@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Cc: netdev@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    ---
    drivers/net/ethernet/sgi/ioc3-eth.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
    index 9c0488e0f08e..18d533fdf14c 100644
    --- a/drivers/net/ethernet/sgi/ioc3-eth.c
    +++ b/drivers/net/ethernet/sgi/ioc3-eth.c
    @@ -764,9 +764,9 @@ static inline void ioc3_setup_duplex(struct ioc3_private *ip)
    ioc3_w_emcr(ip->emcr);
    }

    -static void ioc3_timer(unsigned long data)
    +static void ioc3_timer(struct timer_list *t)
    {
    - struct ioc3_private *ip = (struct ioc3_private *) data;
    + struct ioc3_private *ip = from_timer(ip, t, ioc3_timer);

    /* Print the link status if it has changed */
    mii_check_media(&ip->mii, 1, 0);
    @@ -818,8 +818,6 @@ static int ioc3_mii_init(struct ioc3_private *ip)
    static void ioc3_mii_start(struct ioc3_private *ip)
    {
    ip->ioc3_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */
    - ip->ioc3_timer.data = (unsigned long) ip;
    - ip->ioc3_timer.function = ioc3_timer;
    add_timer(&ip->ioc3_timer);
    }

    @@ -1291,7 +1289,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
    #endif

    spin_lock_init(&ip->ioc3_lock);
    - init_timer(&ip->ioc3_timer);
    + timer_setup(&ip->ioc3_timer, ioc3_timer, 0);

    ioc3_stop(ip);
    ioc3_init(dev);
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-10-17 02:39    [W:4.282 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site