From patchwork Sun May 31 09:35:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 6515561 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6B95EC0020 for ; Sun, 31 May 2015 09:36:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A69A2069B for ; Sun, 31 May 2015 09:36:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CB18204D1 for ; Sun, 31 May 2015 09:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758211AbbEaJgQ (ORCPT ); Sun, 31 May 2015 05:36:16 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:36371 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758167AbbEaJgJ (ORCPT ); Sun, 31 May 2015 05:36:09 -0400 Received: by wgbgq6 with SMTP id gq6so92646832wgb.3 for ; Sun, 31 May 2015 02:36:07 -0700 (PDT) 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=jwxq6oKTE4lQ5idxCXItD+hMZEBSST0GZmK/sPGjqyM=; b=VlHgML1kYei/oEAHT/D8cXZrtsPWFpWM61dIRm/FMLQHs6fkDkoi6wIZNX4aYkNdey 4KeBCtYS4wugYXuOC3/f1Bzr5g5qMvJUaes6HY+KSn0j3UTZR4rIFomRhuUUoazACEcx jTTb0D858/quWY3pbSJGF2bweNzuAJf8SZ0XfZAqaBwZHxgl1UnldWxBLqFnEPgmPCqv 1Ozp0dSnVSwk/SwBX64z76ChFq4Xpy1dk8vSIoA9pHY69oiZB2Wqe4DZG6UO06YXz/RJ SVIGqHVuwzDG45fD+LVSwpV+lodASBl3QiaStFso6qH+2wFJVmDnqmQbZLBqalbVtTpr pXfQ== X-Received: by 10.180.149.173 with SMTP id ub13mr11086432wib.23.1433064967614; Sun, 31 May 2015 02:36:07 -0700 (PDT) Received: from tipsey.3.home (188.31.131.59.threembb.co.uk. [188.31.131.59]) by mx.google.com with ESMTPSA id t17sm11193426wij.1.2015.05.31.02.36.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 May 2015 02:36:06 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 8/9] staging: vt6655: replace and resize dwIsr Date: Sun, 31 May 2015 10:35:27 +0100 Message-Id: <1433064928-2139-8-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433064928-2139-1-git-send-email-tvboxspy@gmail.com> References: <1433064928-2139-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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 dwIsr is not used outside vnt_interrupt_process and should be u32. Move to function and resize to u32. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/device.h | 1 - drivers/staging/vt6655/device_main.c | 33 +++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index b928c2a..5cf1b33 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -238,7 +238,6 @@ struct vnt_private { CHIP_TYPE chip_id; void __iomem *PortOffset; - unsigned long dwIsr; u32 memaddr; u32 ioaddr; u32 io_size; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 575ba87..aec3cce 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1056,15 +1056,16 @@ static void vnt_interrupt_process(struct vnt_private *priv) struct ieee80211_low_level_stats *low_stats = &priv->low_stats; int max_count = 0; u32 mib_counter; + u32 isr; unsigned long flags; - MACvReadISR(priv->PortOffset, &priv->dwIsr); + MACvReadISR(priv->PortOffset, &isr); - if (priv->dwIsr == 0) + if (isr == 0) return; - if (priv->dwIsr == 0xffffffff) { - pr_debug("dwIsr = 0xffff\n"); + if (isr == 0xffffffff) { + pr_debug("isr = 0xffff\n"); return; } @@ -1086,18 +1087,18 @@ static void vnt_interrupt_process(struct vnt_private *priv) * than RD/TD write back * update ISR counter */ - while (priv->dwIsr && priv->vif) { - MACvWriteISR(priv->PortOffset, priv->dwIsr); + while (isr && priv->vif) { + MACvWriteISR(priv->PortOffset, isr); - if (priv->dwIsr & ISR_FETALERR) { + if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); VNSvOutPortW(priv->PortOffset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); - device_error(priv, priv->dwIsr); + device_error(priv, isr); } - if (priv->dwIsr & ISR_TBTT) { + if (isr & ISR_TBTT) { if (priv->op_mode != NL80211_IFTYPE_ADHOC) vnt_check_bb_vga(priv); @@ -1116,7 +1117,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) } - if (priv->dwIsr & ISR_BNTX) { + if (isr & ISR_BNTX) { if (priv->op_mode == NL80211_IFTYPE_ADHOC) { priv->bIsBeaconBufReadySet = false; priv->cbBeaconBufReadySetCnt = 0; @@ -1125,19 +1126,19 @@ static void vnt_interrupt_process(struct vnt_private *priv) priv->bBeaconSent = true; } - if (priv->dwIsr & ISR_RXDMA0) + if (isr & ISR_RXDMA0) max_count += device_rx_srv(priv, TYPE_RXDMA0); - if (priv->dwIsr & ISR_RXDMA1) + if (isr & ISR_RXDMA1) max_count += device_rx_srv(priv, TYPE_RXDMA1); - if (priv->dwIsr & ISR_TXDMA0) + if (isr & ISR_TXDMA0) max_count += device_tx_srv(priv, TYPE_TXDMA0); - if (priv->dwIsr & ISR_AC0DMA) + if (isr & ISR_AC0DMA) max_count += device_tx_srv(priv, TYPE_AC0DMA); - if (priv->dwIsr & ISR_SOFTTIMER1) { + if (isr & ISR_SOFTTIMER1) { if (priv->vif->bss_conf.enable_beacon) vnt_beacon_make(priv, priv->vif); } @@ -1148,7 +1149,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) ieee80211_queue_stopped(priv->hw, 0)) ieee80211_wake_queues(priv->hw); - MACvReadISR(priv->PortOffset, &priv->dwIsr); + MACvReadISR(priv->PortOffset, &isr); MACvReceive0(priv->PortOffset); MACvReceive1(priv->PortOffset);