mISDN: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ch->workq when freeing channel and cancel it on
release.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org

diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 307bd6e8988bed710830db7ddbb3ce8c3a08aac4..199f374cf9da42173c15a3b10b9d7387bf84fab0 100644 (file)
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch)
        }
        skb_queue_purge(&ch->squeue);
        skb_queue_purge(&ch->rqueue);
-       flush_scheduled_work();
+       flush_work_sync(&ch->workq);
        return 0;
 }
 EXPORT_SYMBOL(mISDN_freedchannel);
@@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch)
        mISDN_clear_bchannel(ch);
        skb_queue_purge(&ch->rqueue);
        ch->rcount = 0;
-       flush_scheduled_work();
+       flush_work_sync(&ch->workq);
        return 0;
 }
 EXPORT_SYMBOL(mISDN_freebchannel);

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 5b59796ed250f53ae4e3a261583cd60a525a0cc1..bd526f664a3966217f0317497a943deba197982e 100644 (file)
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc)
        if (timer_pending(&hc->timeout_tl))
                del_timer(&hc->timeout_tl);
 
+       cancel_work_sync(&hc->workq);
+
        if (hc->socket_thread)
                l1oip_socket_close(hc);