From patchwork Thu Sep 11 10:09:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sharma, Sanjeev" X-Patchwork-Id: 4884381 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2CFCEC0338 for ; Thu, 11 Sep 2014 10:10:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A2682025A for ; Thu, 11 Sep 2014 10:10:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C315C2022A for ; Thu, 11 Sep 2014 10:10:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753968AbaIKKJu (ORCPT ); Thu, 11 Sep 2014 06:09:50 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:43806 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776AbaIKKJt (ORCPT ); Thu, 11 Sep 2014 06:09:49 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XS1Jy-0001Ri-NC from sanjeevs@inn.mentorg.com ; Thu, 11 Sep 2014 03:09:46 -0700 Received: from inndt291.inn.mentorg.com (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 11 Sep 2014 11:09:45 +0100 Received: from inndt291.inn.mentorg.com (localhost [127.0.0.1]) by inndt291.inn.mentorg.com (8.14.5/8.14.5) with ESMTP id s8BA9hEm019981; Thu, 11 Sep 2014 15:39:43 +0530 Received: (from sanjeevs@localhost) by inndt291.inn.mentorg.com (8.14.5/8.14.5/Submit) id s8BA9fu1019980; Thu, 11 Sep 2014 15:39:41 +0530 From: Sanjeev Sharma To: CC: , , , , Sanjeev Sharma , Sanjeev Sharma Subject: [PATCH v2] zd1211rw: replace ZD_ASSERT with lockdep_assert_held() Date: Thu, 11 Sep 2014 15:39:39 +0530 Message-ID: <1410430179-19944-1-git-send-email-sanjeev_sharma@mentor.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1410418407.1825.0.camel@jlt4.sipsolutions.net> References: <1410418407.1825.0.camel@jlt4.sipsolutions.net> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 on some architecture spin_is_locked() always return false in uniprocessor configuration and therefore it would be advise to replace with lockdep_assert_held(). Signed-off-by: Sanjeev Sharma --- Changes in v2: - corrected the typo drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index e7af261..adce2ee 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -235,7 +235,7 @@ void zd_mac_clear(struct zd_mac *mac) { flush_workqueue(zd_workqueue); zd_chip_clear(&mac->chip); - ZD_ASSERT(!spin_is_locked(&mac->lock)); + lockdep_assert_held(&mac->lock); ZD_MEMCLEAR(mac, sizeof(struct zd_mac)); }