* [PATCH 1/1] r8169: replace init_timer with setup_timer
@ 2017-03-12 9:02 Zhu Yanjun
2017-03-13 6:55 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Zhu Yanjun @ 2017-03-12 9:02 UTC (permalink / raw)
To: nic_swsd, netdev
Replace init_timer with setup_timer to simplify the source code.
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
---
drivers/net/ethernet/realtek/r8169.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 81f18a8..44cc422 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -8444,9 +8444,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;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] r8169: replace init_timer with setup_timer
2017-03-12 9:02 [PATCH 1/1] r8169: replace init_timer with setup_timer Zhu Yanjun
@ 2017-03-13 6:55 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-03-13 6:55 UTC (permalink / raw)
To: yanjun.zhu; +Cc: nic_swsd, netdev
From: Zhu Yanjun <yanjun.zhu@oracle.com>
Date: Sun, 12 Mar 2017 05:02:54 -0400
> Replace init_timer with setup_timer to simplify the source code.
>
> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-13 6:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-12 9:02 [PATCH 1/1] r8169: replace init_timer with setup_timer Zhu Yanjun
2017-03-13 6:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).