diff options
| author | Zhu Yanjun <yanjun.zhu@oracle.com> | 2017-03-12 05:02:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-12 23:55:03 -0700 |
| commit | 1bcf165ac6556dc55a596d524b8187d1ba7a8c7d (patch) | |
| tree | 49279910b4f62558b43b59e4edb3d6d7cd90cb8b | |
| parent | 13d61c3adb5d8dc471a5f73ebe13b4f1a1e93c4f (diff) | |
| download | linux-1bcf165ac6556dc55a596d524b8187d1ba7a8c7d.tar.bz2 | |
r8169: replace init_timer with setup_timer
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>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 24b045b777b6..0a8f2817ea60 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -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; |