diff options
author | Tejun Heo <tj@kernel.org> | 2014-03-07 10:24:47 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-03-07 10:24:47 -0500 |
commit | d82fead4639ab657d70f71b2bfefcd387a7c2a4c (patch) | |
tree | ed96fbcfb8a14d319348234aea315cbf03f04f89 | |
parent | 5078585a18c8cb7d1b6b7744fce842dadb3b7c72 (diff) |
wireless/rt2x00: don't use PREPARE_WORK in rt2800usb.c
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.
Update rt2800usb.c to use INIT_WORK() instead of PREPARE_WORK(). As
the work item isn't in active use during rt2800usb_probe_hw(), this
doesn't cause any behavior difference.
It would probably be best to route this with other related updates
through the workqueue tree.
Only compile tested.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Gertjan van Wingerde <gwingerde@gmail.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: linux-wireless@vger.kernel.org
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index caddc1b427a9..42a2e06512f2 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
@@ -764,7 +764,7 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
764 | /* | 764 | /* |
765 | * Overwrite TX done handler | 765 | * Overwrite TX done handler |
766 | */ | 766 | */ |
767 | PREPARE_WORK(&rt2x00dev->txdone_work, rt2800usb_work_txdone); | 767 | INIT_WORK(&rt2x00dev->txdone_work, rt2800usb_work_txdone); |
768 | 768 | ||
769 | return 0; | 769 | return 0; |
770 | } | 770 | } |