From patchwork Sun Nov 22 09:07:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7675831 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF8949F1C2 for ; Sun, 22 Nov 2015 09:08:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0080C20662 for ; Sun, 22 Nov 2015 09:08:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDB9020660 for ; Sun, 22 Nov 2015 09:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751795AbbKVJIo (ORCPT ); Sun, 22 Nov 2015 04:08:44 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38703 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751333AbbKVJIN (ORCPT ); Sun, 22 Nov 2015 04:08:13 -0500 Received: by wmec201 with SMTP id c201so69798406wme.1 for ; Sun, 22 Nov 2015 01:08:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xAAPRUjpZH6eoDR8/bbpw2RNkDXpLk04LqIhYbzbuBA=; b=z91o95A/wP+PyC+6/x6R10F+RhZhoDwIZhEfRTpMMrZHGjEeZW3ylkt2dPpiJRooBc 7l+VuYB2cPAvylqQBUIanc84R0LS2GUy0fRHWA70NCXJ5nBrqnQcsZzVbrTXiY4Ms6KY 43rVJmhF+UlU0xz9NmxOjNtSkjlhAWfpWUuzGB6U+ISLZ+wwd3f15S6T9b23ewvtHDPb yf8S7YQvelRGzc6SrwaovSQFsv5nAWCkYtA5GKE0E+DZ+xQcENbwaPsaEK4yRnusu1CO hAUeooOEa5Tr13M2oBa08uxWhqME5cWZuB0sDjN1XPyWjcs1cK/wHHNSyDrmjrwFC6sz 7qBg== X-Received: by 10.194.78.212 with SMTP id d20mr26364731wjx.70.1448183292071; Sun, 22 Nov 2015 01:08:12 -0800 (PST) Received: from tipsey.3.home (188.31.153.139.threembb.co.uk. [188.31.153.139]) by smtp.gmail.com with ESMTPSA id c13sm7696650wmd.14.2015.11.22.01.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Nov 2015 01:08:11 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 6/8] staging: vt6655: rf.c/h Replace DeviceContext with vnt_private Date: Sun, 22 Nov 2015 09:07:20 +0000 Message-Id: <1448183242-3397-6-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448183242-3397-1-git-send-email-tvboxspy@gmail.com> References: <1448183242-3397-1-git-send-email-tvboxspy@gmail.com> 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.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Removing void and including device.h for power.h Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/power.c | 10 +++------- drivers/staging/vt6655/power.h | 8 +++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index e58afbd..ad44746 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -64,11 +64,10 @@ void PSvEnablePowerSaving( - void *hDeviceContext, + struct vnt_private *priv, unsigned short wListenInterval ) { - struct vnt_private *priv = hDeviceContext; u16 wAID = priv->current_aid | BIT(14) | BIT(15); /* set period of power up before TBTT */ @@ -117,11 +116,9 @@ PSvEnablePowerSaving( void PSvDisablePowerSaving( - void *hDeviceContext + struct vnt_private *priv ) { - struct vnt_private *priv = hDeviceContext; - /* disable power saving hw function */ MACbPSWakeup(priv->PortOffset); /* clear AutoSleep */ @@ -149,10 +146,9 @@ PSvDisablePowerSaving( bool PSbIsNextTBTTWakeUp( - void *hDeviceContext + struct vnt_private *priv ) { - struct vnt_private *priv = hDeviceContext; struct ieee80211_hw *hw = priv->hw; struct ieee80211_conf *conf = &hw->conf; bool bWakeUp = false; diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h index 538e685..d82dd8d 100644 --- a/drivers/staging/vt6655/power.h +++ b/drivers/staging/vt6655/power.h @@ -29,25 +29,27 @@ #ifndef __POWER_H__ #define __POWER_H__ +#include "device.h" + #define C_PWBT 1000 /* micro sec. power up before TBTT */ #define PS_FAST_INTERVAL 1 /* Fast power saving listen interval */ #define PS_MAX_INTERVAL 4 /* MAX power saving listen interval */ void PSvDisablePowerSaving( - void *hDeviceContext + struct vnt_private * ); void PSvEnablePowerSaving( - void *hDeviceContext, + struct vnt_private *, unsigned short wListenInterval ); bool PSbIsNextTBTTWakeUp( - void *hDeviceContext + struct vnt_private * ); #endif /* __POWER_H__ */