net/dsa: don't use flush_scheduled_work()
Tejun Heo [Fri, 24 Dec 2010 14:59:06 +0000 (15:59 +0100)]
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>

net/dsa/dsa.c

index 6112a12..0c877a7 100644 (file)
@@ -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];