From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139AbaIKKJv (ORCPT ); Thu, 11 Sep 2014 06:09:51 -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 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 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)); } -- 1.7.11.7