diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 16:01:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 16:01:31 -0700 |
| commit | 916082b073ebb7f4e064cebce0768e34cacde508 (patch) | |
| tree | 8a8037ebbaaffb2336ac4526a7f87ac9a22aeafd /drivers/net | |
| parent | aecdc33e111b2c447b622e287c6003726daa1426 (diff) | |
| download | linux-916082b073ebb7f4e064cebce0768e34cacde508.tar.gz | |
workqueue: avoid using deprecated functions
The network merge brought in a few users of functions that got deprecated by the workqueue cleanups: the 'system_nrt_wq' is now the same as the regular system_wq, since all workqueues are now non- reentrant. Similarly, remove one use of flush_work_sync() - the regular flush_work() has become synchronous, and the "_sync()" version is thus deprecated as being superfluous. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 0e53d4f431d2..ed7521693980 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -718,7 +718,7 @@ static int __devexit mrf24j40_remove(struct spi_device *spi) dev_dbg(printdev(devrec), "remove\n"); free_irq(spi->irq, devrec); - flush_work_sync(&devrec->irqwork); /* TODO: Is this the right call? */ + flush_work(&devrec->irqwork); /* TODO: Is this the right call? */ ieee802154_unregister_device(devrec->dev); ieee802154_free_device(devrec->dev); /* TODO: Will ieee802154_free_device() wait until ->xmit() is |