diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
| commit | 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679 (patch) | |
| tree | ed63d25f7034651be0afd7fbe046cfa464b7aece /drivers/media/dvb/mantis | |
| parent | 99ef21216b4f85c56392ed41500d2f07f58cc360 (diff) | |
| download | op-kernel-dev-0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679.zip op-kernel-dev-0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679.tar.gz | |
dvb: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
* Flush the used works directly.
* Replace the deprecated cancel_rearming_delayed_work() +
flush_scheduled_work() -> cancel_delayed_work_sync().
* Make sure mantis->uart_work isn't running on exit.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-media@vger.kernel.org
Diffstat (limited to 'drivers/media/dvb/mantis')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_evm.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_uart.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c index a7b369a..9f73c2c 100644 --- a/drivers/media/dvb/mantis/mantis_evm.c +++ b/drivers/media/dvb/mantis/mantis_evm.c @@ -111,7 +111,7 @@ void mantis_evmgr_exit(struct mantis_ca *ca) struct mantis_pci *mantis = ca->ca_priv; dprintk(MANTIS_DEBUG, 1, "Mantis Host I/F Event manager exiting"); - flush_scheduled_work(); + flush_work_sync(&ca->hif_evm_work); mantis_hif_exit(ca); mantis_pcmcia_exit(ca); } diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c index 7d2f239..97b889e 100644 --- a/drivers/media/dvb/mantis/mantis_uart.c +++ b/drivers/media/dvb/mantis/mantis_uart.c @@ -182,5 +182,6 @@ void mantis_uart_exit(struct mantis_pci *mantis) { /* disable interrupt */ mmwrite(mmread(MANTIS_UART_CTL) & 0xffef, MANTIS_UART_CTL); + flush_work_sync(&mantis->uart_work); } EXPORT_SYMBOL_GPL(mantis_uart_exit); |
