From patchwork Thu Feb 20 20:44:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 3689911 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B0EE99F2EC for ; Thu, 20 Feb 2014 20:47:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB21E2012E for ; Thu, 20 Feb 2014 20:47:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E13742010B for ; Thu, 20 Feb 2014 20:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753376AbaBTUok (ORCPT ); Thu, 20 Feb 2014 15:44:40 -0500 Received: from mail-qc0-f177.google.com ([209.85.216.177]:59480 "EHLO mail-qc0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752723AbaBTUoj (ORCPT ); Thu, 20 Feb 2014 15:44:39 -0500 Received: by mail-qc0-f177.google.com with SMTP id i8so4069139qcq.8 for ; Thu, 20 Feb 2014 12:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Glrxoaah5CKoFhBH8IVFc0VecZdxyQupt1S4fCnOeaI=; b=JKN4PtKVtahqtIlX2wvrOB/l98fA+nYc+pKNYJsG/pIyKD+Xk6a9cHft3NDOSGSKMI nEoLntPKoFdJvaMcEvestC31TeSob2nbThYbr4AMRqt0kQUlMDNEmJwCyPom/y6xFWVq kJDJVcM3xNPf7rtaYDmbISq+GLgFnCxEObdpakOcKhWXy73PQLFWadWifj2XAlYFu/A+ imvnzFhfojc3c7VO35DYH7Z4WS5Cz195l1ppg1AOYv9E7ImCVrDjNr4pVEs6EINJX3G+ ZvJ/ZKA+Q9ZDDM/iKvD1+Cineq86d9DTGToOtzy4wLqPzUUW2eypI0k7bTL2rzFWxiRy HYMw== X-Received: by 10.224.79.19 with SMTP id n19mr4463524qak.99.1392929078006; Thu, 20 Feb 2014 12:44:38 -0800 (PST) Received: from htj.dyndns.org.com (207-38-225-25.c3-0.43d-ubr1.qens-43d.ny.cable.rcn.com. [207.38.225.25]) by mx.google.com with ESMTPSA id d15sm15192946qaq.4.2014.02.20.12.44.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Feb 2014 12:44:37 -0800 (PST) From: Tejun Heo To: laijs@cn.fujitsu.com Cc: linux-kernel@vger.kernel.org, Tejun Heo , Ivo van Doorn , Gertjan van Wingerde , Helmut Schaa , linux-wireless@vger.kernel.org Subject: [PATCH 1/9] wireless/rt2x00: don't use PREPARE_WORK in rt2800usb.c Date: Thu, 20 Feb 2014 15:44:23 -0500 Message-Id: <1392929071-16555-2-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392929071-16555-1-git-send-email-tj@kernel.org> References: <1392929071-16555-1-git-send-email-tj@kernel.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Ivo van Doorn Cc: Gertjan van Wingerde Cc: Helmut Schaa Cc: linux-wireless@vger.kernel.org --- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index caddc1b..42a2e06 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) /* * Overwrite TX done handler */ - PREPARE_WORK(&rt2x00dev->txdone_work, rt2800usb_work_txdone); + INIT_WORK(&rt2x00dev->txdone_work, rt2800usb_work_txdone); return 0; }