From patchwork Sat Feb 12 18:43:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jussi Kivilinna X-Patchwork-Id: 552151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1CIhxYu001104 for ; Sat, 12 Feb 2011 18:43:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752562Ab1BLSn5 (ORCPT ); Sat, 12 Feb 2011 13:43:57 -0500 Received: from saarni.dnainternet.net ([83.102.40.136]:40225 "EHLO saarni.dnainternet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411Ab1BLSn5 (ORCPT ); Sat, 12 Feb 2011 13:43:57 -0500 Received: from localhost (localhost [127.0.0.1]) by saarni.dnainternet.net (Postfix) with ESMTP id 4BE52E7246; Sat, 12 Feb 2011 20:43:56 +0200 (EET) X-Virus-Scanned: DNA Postiturva at dnainternet.net X-Spam-Flag: NO X-Spam-Score: -1.44 X-Spam-Level: X-Spam-Status: No, score=-1.44 tagged_above=-9999 required=6 tests=[ALL_TRUSTED=-1.44] Received: from saarni.dnainternet.net ([83.102.40.136]) by localhost (saarni.dnainternet.net [127.0.0.1]) (amavisd-new, port 10041) with ESMTP id bqLPYamUkFgg; Sat, 12 Feb 2011 20:43:56 +0200 (EET) Received: from omenapuu.dnainternet.net (omenapuu.dnainternet.net [83.102.40.212]) by saarni.dnainternet.net (Postfix) with ESMTP id 25052E60B5; Sat, 12 Feb 2011 20:43:56 +0200 (EET) Received: from fate.lan (dyn2-212-50-133-226.psoas.suomi.net [212.50.133.226]) by omenapuu.dnainternet.net (Postfix) with ESMTP id DA60D2BAF0; Sat, 12 Feb 2011 20:43:51 +0200 (EET) Subject: [PATCH 4/4] zd1211rw: add unlikely to ZD_ASSERT To: linux-wireless@vger.kernel.org From: Jussi Kivilinna Cc: Daniel Drake , "John W. Linville" , Ulrich Kunitz Date: Sat, 12 Feb 2011 20:43:51 +0200 Message-ID: <20110212184351.2062.10473.stgit@fate.lan> In-Reply-To: <20110212184254.2062.33710.stgit@fate.lan> References: <20110212184254.2062.33710.stgit@fate.lan> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 12 Feb 2011 18:43:59 +0000 (UTC) diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h index 6ac597f..5463ca9 100644 --- a/drivers/net/wireless/zd1211rw/zd_def.h +++ b/drivers/net/wireless/zd1211rw/zd_def.h @@ -45,7 +45,7 @@ typedef u16 __nocast zd_addr_t; #ifdef DEBUG # define ZD_ASSERT(x) \ do { \ - if (!(x)) { \ + if (unlikely(!(x))) { \ pr_debug("%s:%d ASSERT %s VIOLATED!\n", \ __FILE__, __LINE__, __stringify(x)); \ dump_stack(); \