Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d26aa70 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
parent d9c612eb

drivers/isdn/mISDN/hwchannel.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch) 
	}

	}

	skb_queue_purge(&ch->squeue);

	skb_queue_purge(&ch->squeue);

	skb_queue_purge(&ch->rqueue);

	skb_queue_purge(&ch->rqueue);

	flush_scheduled_work();

	flush_work_sync(&ch->workq);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(mISDN_freedchannel);

EXPORT_SYMBOL(mISDN_freedchannel);
@@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch) 
	mISDN_clear_bchannel(ch);

	mISDN_clear_bchannel(ch);

	skb_queue_purge(&ch->rqueue);

	skb_queue_purge(&ch->rqueue);

	ch->rcount = 0;

	ch->rcount = 0;

	flush_scheduled_work();

	flush_work_sync(&ch->workq);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(mISDN_freebchannel);

EXPORT_SYMBOL(mISDN_freebchannel);

drivers/isdn/mISDN/l1oip_core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc) 
	if (timer_pending(&hc->timeout_tl))

	if (timer_pending(&hc->timeout_tl))

		del_timer(&hc->timeout_tl);

		del_timer(&hc->timeout_tl);





	cancel_work_sync(&hc->workq);



	if (hc->socket_thread)

	if (hc->socket_thread)

		l1oip_socket_close(hc);

		l1oip_socket_close(hc);