From patchwork Sun Mar 6 12:57:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513271 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 6C67DC0553 for ; Sun, 6 Mar 2016 12:57:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E469F2017E for ; Sun, 6 Mar 2016 12:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3F6320172 for ; Sun, 6 Mar 2016 12:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbcCFM5d (ORCPT ); Sun, 6 Mar 2016 07:57:33 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36727 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751361AbcCFM53 (ORCPT ); Sun, 6 Mar 2016 07:57:29 -0500 Received: by mail-wm0-f68.google.com with SMTP id l68so6276861wml.3 for ; Sun, 06 Mar 2016 04:57:28 -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=o2dKSRh+iFZFyBUzBrf7m/cf2JR0wPyafd1YkAHz7yg=; b=V3kubPoa09TCAZOfP1N8qIUhkV0lslQIzlO35mjGjGCdgpPyUjy0xiLWq4CY7hSeDO t5JdyPEoUWErkyN3h15uOFgpp0tViObf0JOSl/yOL6QNlnpLtICWqfD6/dGRPLyDdrTa VkC6wOG61J1uv6DLT52x4MLnocPw+BQ21iLTS4SCyvQ1TVZK2m48uzEgG2ah7R7t21e+ zLc+cXYgS7I0gEWJtvEFbETs/SkPlFeMDBb1tYoUoq97pft2xLCG26F0TT2zh35spV/O qx1730iXc3GuZDd1BAVeZ3t4nmt+0xzCWEF72GAIY8BPiL/graKTMqVspi8v/KChMEln IyxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o2dKSRh+iFZFyBUzBrf7m/cf2JR0wPyafd1YkAHz7yg=; b=kdeZxijkK1iaV22ERX1TlzvkYlpBqsDQLDPssnPLH0o5k9zZRPVqb7q+A6JF3/+q19 VbyU6ze4sXYjkTI3tlfPfopFF5yIOKYXJMxIvEGFb+11jqNQsuOv5jzJdsmjD0tPXVV6 Y7Kh2JlLtW0nG6tzaMEH7SdVlCr4Uf7hoCQVUPGfunVHlKdS0KrC921ZtS7GVUyw7idH alrPkVj8Z0XdLRkySO2C5cBo3Lp1v+iEn38YUKtjmeZIdKjyrnWtHCy4BxkW/UcbNQEe HDImp9BBzluJ3vx0NUzFDT2lcMcvlsZoPIj8H/rs6NuC3RlmDhHDKCinBOWExrvrc+e0 dhDw== X-Gm-Message-State: AD7BkJLtJygdhtaT64VGiHdhrY7Y/dmcHOAsddkvtdoRrF1Msf6hHFBwX7IUa/yyCLY+kA== X-Received: by 10.28.183.137 with SMTP id h131mr8214066wmf.100.1457269047328; Sun, 06 Mar 2016 04:57:27 -0800 (PST) Received: from tipsey.3.home (188.30.137.64.threembb.co.uk. [188.30.137.64]) by smtp.gmail.com with ESMTPSA id n10sm12839950wjf.28.2016.03.06.04.57.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:26 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 03/13] staging: vt6655: mac.c/h resize all unsigned long to u32 Date: Sun, 6 Mar 2016 12:57:02 +0000 Message-Id: <1457269032-2681-3-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457269032-2681-1-git-send-email-tvboxspy@gmail.com> References: <1457269032-2681-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, 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 All addressing is limited to 32 bits match this to all functions and port out functions. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/mac.c | 22 +++++++++++----------- drivers/staging/vt6655/mac.h | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 02e3e42..c2723c1 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -264,17 +264,17 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) /* restore CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR */ VNSvOutPortD(io_base + MAC_REG_TXDMAPTR0, - *(unsigned long *)(cxt_buf + MAC_REG_TXDMAPTR0)); + *(u32 *)(cxt_buf + MAC_REG_TXDMAPTR0)); VNSvOutPortD(io_base + MAC_REG_AC0DMAPTR, - *(unsigned long *)(cxt_buf + MAC_REG_AC0DMAPTR)); + *(u32 *)(cxt_buf + MAC_REG_AC0DMAPTR)); VNSvOutPortD(io_base + MAC_REG_BCNDMAPTR, - *(unsigned long *)(cxt_buf + MAC_REG_BCNDMAPTR)); + *(u32 *)(cxt_buf + MAC_REG_BCNDMAPTR)); VNSvOutPortD(io_base + MAC_REG_RXDMAPTR0, - *(unsigned long *)(cxt_buf + MAC_REG_RXDMAPTR0)); + *(u32 *)(cxt_buf + MAC_REG_RXDMAPTR0)); VNSvOutPortD(io_base + MAC_REG_RXDMAPTR1, - *(unsigned long *)(cxt_buf + MAC_REG_RXDMAPTR1)); + *(u32 *)(cxt_buf + MAC_REG_RXDMAPTR1)); } /* @@ -557,7 +557,7 @@ void MACvInitialize(struct vnt_private *priv) * Return Value: none * */ -void MACvSetCurrRx0DescAddr(struct vnt_private *priv, unsigned long dwCurrDescAddr) +void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -591,7 +591,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, unsigned long dwCurrDescAd * Return Value: none * */ -void MACvSetCurrRx1DescAddr(struct vnt_private *priv, unsigned long dwCurrDescAddr) +void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -627,7 +627,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, unsigned long dwCurrDescAd * */ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, - unsigned long dwCurrDescAddr) + u32 dwCurrDescAddr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -663,7 +663,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, */ /* TxDMA1 = AC0DMA */ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, - unsigned long dwCurrDescAddr) + u32 dwCurrDescAddr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -685,7 +685,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, } void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - unsigned long dwCurrDescAddr) + u32 dwCurrDescAddr) { if (iTxType == TYPE_AC0DMA) MACvSetCurrAC0DescAddrEx(priv, dwCurrDescAddr); @@ -753,7 +753,7 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime } void MACvSetMISCFifo(struct vnt_private *priv, unsigned short wOffset, - unsigned long dwData) + u32 dwData) { void __iomem *io_base = priv->PortOffset; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 192f466..3eef928 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -916,24 +916,24 @@ bool MACbSafeStop(struct vnt_private *); bool MACbShutdown(struct vnt_private *); void MACvInitialize(struct vnt_private *); void MACvSetCurrRx0DescAddr(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrRx1DescAddr(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrSyncDescAddrEx(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvSetCurrATIMDescAddrEx(struct vnt_private *, - unsigned long dwCurrDescAddr); + u32 dwCurrDescAddr); void MACvTimer0MicroSDelay(struct vnt_private *, unsigned int uDelay); void MACvOneShotTimer1MicroSec(struct vnt_private *, unsigned int uDelayTime); void MACvSetMISCFifo(struct vnt_private *, unsigned short wOffset, - unsigned long dwData); + u32 dwData); bool MACbPSWakeup(struct vnt_private *);