]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
r8169: replace init_timer with setup_timer
authorZhu Yanjun <yanjun.zhu@oracle.com>
Sun, 12 Mar 2017 09:02:54 +0000 (05:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Mar 2017 06:55:03 +0000 (23:55 -0700)
Replace init_timer with setup_timer to simplify the source code.

Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 24b045b777b601c2c8d8d048f9cdb744a589bf29..0a8f2817ea60f2172eb28177473a4879f85bd18a 100644 (file)
@@ -8453,9 +8453,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        tp->opts1_mask = (tp->mac_version != RTL_GIGA_MAC_VER_01) ?
                ~(RxBOVF | RxFOVF) : ~0;
 
-       init_timer(&tp->timer);
-       tp->timer.data = (unsigned long) dev;
-       tp->timer.function = rtl8169_phy_timer;
+       setup_timer(&tp->timer, rtl8169_phy_timer, (unsigned long)dev);
 
        tp->rtl_fw = RTL_FIRMWARE_UNKNOWN;