diff options
| author | Tejun Heo <tj@kernel.org> | 2014-03-07 10:24:48 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-07 10:24:48 -0500 |
| commit | 4a8bb7f54860a3241b177bdeb06bb880151a23dc (patch) | |
| tree | 98f9da64a3587340a1dd0323abb53bdd508abdfc | |
| parent | d82fead4639ab657d70f71b2bfefcd387a7c2a4c (diff) | |
| download | lwn-4a8bb7f54860a3241b177bdeb06bb880151a23dc.tar.gz lwn-4a8bb7f54860a3241b177bdeb06bb880151a23dc.zip | |
ps3-vuart: don't use PREPARE_WORK
PREPARE_[DELAYED_]WORK() are being phased out. They have few users
and a nasty surprise in terms of reentrancy guarantee as workqueue
considers work items to be different if they don't have the same work
function.
ps3_vuart wasn't overriding the work item with multiple work functions
but was using NULL for INIT_WORK() and then single PREPARE_WORK() to
set the work function. We can simply invoke INIT_WORK() with the work
function and remove the PREPARE_WORK() usage.
It would probably be best to route this with other related updates
through the workqueue tree.
Geoff: Tested on ps3 (DECR-1400).
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Geoff Levand <geoff@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: cbe-oss-dev@lists.ozlabs.org
| -rw-r--r-- | drivers/ps3/ps3-vuart.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c index fb7300837fee..bc1e5139ba29 100644 --- a/drivers/ps3/ps3-vuart.c +++ b/drivers/ps3/ps3-vuart.c @@ -699,8 +699,6 @@ int ps3_vuart_read_async(struct ps3_system_bus_device *dev, unsigned int bytes) BUG_ON(!bytes); - PREPARE_WORK(&priv->rx_list.work.work, ps3_vuart_work); - spin_lock_irqsave(&priv->rx_list.lock, flags); if (priv->rx_list.bytes_held >= bytes) { dev_dbg(&dev->core, "%s:%d: schedule_work %xh bytes\n", @@ -1052,7 +1050,7 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev) INIT_LIST_HEAD(&priv->rx_list.head); spin_lock_init(&priv->rx_list.lock); - INIT_WORK(&priv->rx_list.work.work, NULL); + INIT_WORK(&priv->rx_list.work.work, ps3_vuart_work); priv->rx_list.work.trigger = 0; priv->rx_list.work.dev = dev; |