From patchwork Tue Aug 12 07:05:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sharma, Sanjeev" X-Patchwork-Id: 4711061 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 E05DE9F38D for ; Tue, 12 Aug 2014 06:53:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E5A02010B for ; Tue, 12 Aug 2014 06:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66D8F20109 for ; Tue, 12 Aug 2014 06:53:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752155AbaHLGwn (ORCPT ); Tue, 12 Aug 2014 02:52:43 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:64785 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750976AbaHLGwm (ORCPT ); Tue, 12 Aug 2014 02:52:42 -0400 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1XH5wl-0001sD-A7 from sanjeevs@inn.mentorg.com ; Mon, 11 Aug 2014 23:52:39 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 11 Aug 2014 23:52:39 -0700 Received: from inndt291.inn.mentorg.com (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server (TLS) id 14.2.247.3; Tue, 12 Aug 2014 07:52:37 +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 s7C75cYf029531; Tue, 12 Aug 2014 12:35:38 +0530 Received: (from sanjeevs@localhost) by inndt291.inn.mentorg.com (8.14.5/8.14.5/Submit) id s7C75YsP029526; Tue, 12 Aug 2014 12:35:34 +0530 From: Sanjeev Sharma To: , CC: , , , , Sanjeev Sharma , Sanjeev Sharma Subject: [PATCH] zd1211rw: replace ZD_ASSERT with lockdep_assert_held() Date: Tue, 12 Aug 2014 12:35:33 +0530 Message-ID: <1407827133-29493-1-git-send-email-sanjeev_sharma@mentor.com> X-Mailer: git-send-email 1.7.11.7 MIME-Version: 1.0 X-OriginalArrivalTime: 12 Aug 2014 06:52:39.0162 (UTC) FILETIME=[01AD4DA0:01CFB5FA] 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.6 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 --- 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..72c0bc2 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(!spin_is_locked(&mac->lock)); ZD_MEMCLEAR(mac, sizeof(struct zd_mac)); }