Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Tejun Heo 4a8bb7f5 d82fead4

+1 -3
+1 -3
drivers/ps3/ps3-vuart.c
··· 699 699 700 700 BUG_ON(!bytes); 701 701 702 - PREPARE_WORK(&priv->rx_list.work.work, ps3_vuart_work); 703 - 704 702 spin_lock_irqsave(&priv->rx_list.lock, flags); 705 703 if (priv->rx_list.bytes_held >= bytes) { 706 704 dev_dbg(&dev->core, "%s:%d: schedule_work %xh bytes\n", ··· 1050 1052 INIT_LIST_HEAD(&priv->rx_list.head); 1051 1053 spin_lock_init(&priv->rx_list.lock); 1052 1054 1053 - INIT_WORK(&priv->rx_list.work.work, NULL); 1055 + INIT_WORK(&priv->rx_list.work.work, ps3_vuart_work); 1054 1056 priv->rx_list.work.trigger = 0; 1055 1057 priv->rx_list.work.dev = dev; 1056 1058