From patchwork Thu Jan 20 06:16:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Justin P. Mattock" X-Patchwork-Id: 491081 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 p0K6Hcgh028663 for ; Thu, 20 Jan 2011 06:17:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755318Ab1ATGRG (ORCPT ); Thu, 20 Jan 2011 01:17:06 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:36413 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239Ab1ATGRE (ORCPT ); Thu, 20 Jan 2011 01:17:04 -0500 Received: by yxt3 with SMTP id 3so66794yxt.19 for ; Wed, 19 Jan 2011 22:17:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=xh1Zr/F56UO0xPW0zVDumb4hrefnkeu6BucgvbD1pQ0=; b=sxBdHBN16zi+S8cCZfdnZUocROUHkdnGmmS4uF01fZslRbwlIuneisHuxDiQeirLlb lCjWMLKO1CiWzn/q0BpvgmFmxavzYDVssbwKHM817NAGDP3d/fdOYkX+qpG8JfhDgtHO zRoZQ18nSiATOrhHd9BVAfZ1vph9rDOgXxiZs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=wMltC3ofApjMRftayeo+oJ6yEQLx23AceGcAqUukvEK3AuTobUAZnJHGxAp3qLCVHG BGzIjW34U6ic4ePy20hU5oyR83FSnej6WysP8zVtN1eVjiSWIF67jMVG/lPzA7eYjNpl sQ8pTNWxLKiTSC4bPW66Hx6mOfmlRrtD/UXBc= Received: by 10.90.104.20 with SMTP id b20mr2031395agc.193.1295504223035; Wed, 19 Jan 2011 22:17:03 -0800 (PST) Received: from localhost.localdomain ([76.91.45.220]) by mx.google.com with ESMTPS id t1sm9504093ano.23.2011.01.19.22.17.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 19 Jan 2011 22:17:02 -0800 (PST) From: "Justin P. Mattock" To: linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@suse.de, "Justin P. Mattock" Subject: [RFC 1/3]staging: brcm80211 dhd.h Remove CONFIG_HAS_WAKELOCK Date: Wed, 19 Jan 2011 22:16:04 -0800 Message-Id: <1295504166-1042-1-git-send-email-justinmattock@gmail.com> X-Mailer: git-send-email 1.6.5.GIT 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]); Thu, 20 Jan 2011 06:17:50 +0000 (UTC) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 69c6a02..6a382c8 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -33,9 +33,6 @@ #include #include #include -#if defined(CONFIG_HAS_WAKELOCK) -#include -#endif /* defined (CONFIG_HAS_WAKELOCK) */ /* The kernel threading is sdio-specific */ #include @@ -145,9 +142,6 @@ typedef struct dhd_pub { u8 country_code[WLC_CNTRY_BUF_SZ]; char eventmask[WL_EVENTING_MASK_LEN]; -#if defined(CONFIG_HAS_WAKELOCK) - struct wake_lock wakelock[WAKE_LOCK_MAX]; -#endif /* defined (CONFIG_HAS_WAKELOCK) */ } dhd_pub_t; #if defined(CONFIG_PM_SLEEP) @@ -230,41 +224,6 @@ static inline void MUTEX_UNLOCK_WL_SCAN_SET(void) { } -static inline void WAKE_LOCK_INIT(dhd_pub_t *dhdp, int index, char *y) -{ -#if defined(CONFIG_HAS_WAKELOCK) - wake_lock_init(&dhdp->wakelock[index], WAKE_LOCK_SUSPEND, y); -#endif /* defined (CONFIG_HAS_WAKELOCK) */ -} - -static inline void WAKE_LOCK(dhd_pub_t *dhdp, int index) -{ -#if defined(CONFIG_HAS_WAKELOCK) - wake_lock(&dhdp->wakelock[index]); -#endif /* defined (CONFIG_HAS_WAKELOCK) */ -} - -static inline void WAKE_UNLOCK(dhd_pub_t *dhdp, int index) -{ -#if defined(CONFIG_HAS_WAKELOCK) - wake_unlock(&dhdp->wakelock[index]); -#endif /* defined (CONFIG_HAS_WAKELOCK) */ -} - -static inline void WAKE_LOCK_TIMEOUT(dhd_pub_t *dhdp, int index, long time) -{ -#if defined(CONFIG_HAS_WAKELOCK) - wake_lock_timeout(&dhdp->wakelock[index], time); -#endif /* defined (CONFIG_HAS_WAKELOCK) */ -} - -static inline void WAKE_LOCK_DESTROY(dhd_pub_t *dhdp, int index) -{ -#if defined(CONFIG_HAS_WAKELOCK) - wake_lock_destroy(&dhdp->wakelock[index]); -#endif /* defined (CONFIG_HAS_WAKELOCK) */ -} - typedef struct dhd_if_event { u8 ifidx; u8 action;