diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
| commit | 7f6b0db9f63ba423d989e29f6318fe7e68760421 (patch) | |
| tree | 6ea4b47352391656453f48808c6f689697adeea0 /net/dsa | |
| parent | 158fa67753e1eb3edfa5a2d1868666d89d1cf09f (diff) | |
| download | op-kernel-dev-7f6b0db9f63ba423d989e29f6318fe7e68760421.zip op-kernel-dev-7f6b0db9f63ba423d989e29f6318fe7e68760421.tar.gz | |
net/dsa: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush dst->link_poll_work on remove instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 6112a12..0c877a7 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -390,7 +390,7 @@ static int dsa_remove(struct platform_device *pdev) if (dst->link_poll_needed) del_timer_sync(&dst->link_poll_timer); - flush_scheduled_work(); + flush_work_sync(&dst->link_poll_work); for (i = 0; i < dst->pd->nr_chips; i++) { struct dsa_switch *ds = dst->ds[i]; |
