aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
commit7f6b0db9f63ba423d989e29f6318fe7e68760421 (patch)
tree6ea4b47352391656453f48808c6f689697adeea0
parent158fa67753e1eb3edfa5a2d1868666d89d1cf09f (diff)
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>
-rw-r--r--net/dsa/dsa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 6112a12578b2..0c877a74e1f4 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -390,7 +390,7 @@ static int dsa_remove(struct platform_device *pdev)
390 if (dst->link_poll_needed) 390 if (dst->link_poll_needed)
391 del_timer_sync(&dst->link_poll_timer); 391 del_timer_sync(&dst->link_poll_timer);
392 392
393 flush_scheduled_work(); 393 flush_work_sync(&dst->link_poll_work);
394 394
395 for (i = 0; i < dst->pd->nr_chips; i++) { 395 for (i = 0; i < dst->pd->nr_chips; i++) {
396 struct dsa_switch *ds = dst->ds[i]; 396 struct dsa_switch *ds = dst->ds[i];