From patchwork Sun Mar 6 12:57:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513251 X-Patchwork-Delegate: kvalo@adurom.com 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 BC5229F46A for ; Sun, 6 Mar 2016 12:57:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5ADB2017D for ; Sun, 6 Mar 2016 12:57:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B61920172 for ; Sun, 6 Mar 2016 12:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751412AbcCFM52 (ORCPT ); Sun, 6 Mar 2016 07:57:28 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34747 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751361AbcCFM50 (ORCPT ); Sun, 6 Mar 2016 07:57:26 -0500 Received: by mail-wm0-f65.google.com with SMTP id p65so6294869wmp.1 for ; Sun, 06 Mar 2016 04:57:26 -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; bh=+OZaNQx/JvI7NgGddpvur7BfVVnAPcYEhx8Hx+Iv8/k=; b=yZljyN6QTTXhZ16U7Vijlfuz7IZCV3qyz/09tN2aCCaUJ6G3+ir20HKWDV5atXRM4c RD7G5+79NtD9GJIjmWoTYcfDNwaOUblm9k7J6hmSZMw2LgUsm82xx+G8UcTVhngrnf2O ABtCRD3xz6yLXlJDMNtU1PXOer3P2hWRUtfjc3Lh4fLxXqboB/dvq20kIWRh9qrx6kxL kDfjtD1+BUs+8U5sZ9WyJuVYtqejdOWG9cj0Y4yyMkPQxhoaQqKXN4F1UfH66eC73G0L xI3LZ/j5V9uY5nNBsq2tM/85YeFe+ha63aQhZTqizIEjH9tsP8ZgLilX3rjQ+gna72iW xGjw== 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; bh=+OZaNQx/JvI7NgGddpvur7BfVVnAPcYEhx8Hx+Iv8/k=; b=K9IZ/JmRC6/faox/GeVWDm52a001p0Hkztj0Qd1uDVHUpPr2/LmMWu5AhV/CCYwH6u WGZ37buO4jfQ2IW7u6spwuSur1vHjtWYXsXsj/HtM0BwjykId9u6ZxO+QckBoS6UjelY ystdRZBtQuzIZtT6A+Rq8y16qGaCprxMLFkQCS42gB46vJeg1Gf+w42U12Xo2NrfdBf4 CdYLPGURduG8aUNr68sSIIgvTpkNXXFWeo1JcAdIYSzVHd7l+Vov5Y7hFpHFYE2of14s zYXKLpRhPViLUUUTE5NKku23IoWveiLuy7uJOPsBZoqkOxXcaYdT1pUUHHOJhPLOyiIx 4i8w== X-Gm-Message-State: AD7BkJJCgpVF+HiopVlWS2UnUjcrcu9uW4KUf0WvlAmReno98o2FBEc3H6nq9LWjH9sxZw== X-Received: by 10.194.249.42 with SMTP id yr10mr17936616wjc.12.1457269045326; Sun, 06 Mar 2016 04:57:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:24 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 01/13] staging: vt6655: mac.c rename pbyCxtBuf to cxt_buf Date: Sun, 6 Mar 2016 12:57:00 +0000 Message-Id: <1457269032-2681-1-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.7.0 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 Removing camel case and type prefix. Signed-off-by: Malcolm Priestley --- Following on from patch MACvSaveContext use memcpy_fromio to read context. drivers/staging/vt6655/mac.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 66ae991..9c4dabd 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -202,22 +202,22 @@ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode) * In: * io_base - Base Address for MAC * Out: - * pbyCxtBuf - Context buffer + * cxt_buf - Context buffer * * Return Value: none * */ -void MACvSaveContext(struct vnt_private *priv, unsigned char *pbyCxtBuf) +void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) { void __iomem *io_base = priv->PortOffset; /* read page0 register */ - memcpy_fromio(pbyCxtBuf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); + memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); MACvSelectPage1(io_base); /* read page1 register */ - memcpy_fromio(pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base, + memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base, MAC_MAX_CONTEXT_SIZE_PAGE1); MACvSelectPage0(io_base); @@ -230,14 +230,14 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *pbyCxtBuf) * Parameters: * In: * io_base - Base Address for MAC - * pbyCxtBuf - Context buffer + * cxt_buf - Context buffer * Out: * none * * Return Value: none * */ -void MACvRestoreContext(struct vnt_private *priv, unsigned char *pbyCxtBuf) +void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) { void __iomem *io_base = priv->PortOffset; int ii; @@ -246,37 +246,37 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *pbyCxtBuf) /* restore page1 */ for (ii = 0; ii < MAC_MAX_CONTEXT_SIZE_PAGE1; ii++) VNSvOutPortB((io_base + ii), - *(pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); + *(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); MACvSelectPage0(io_base); /* restore RCR,TCR,IMR... */ for (ii = MAC_REG_RCR; ii < MAC_REG_ISR; ii++) - VNSvOutPortB(io_base + ii, *(pbyCxtBuf + ii)); + VNSvOutPortB(io_base + ii, *(cxt_buf + ii)); /* restore MAC Config. */ for (ii = MAC_REG_LRT; ii < MAC_REG_PAGE1SEL; ii++) - VNSvOutPortB(io_base + ii, *(pbyCxtBuf + ii)); + VNSvOutPortB(io_base + ii, *(cxt_buf + ii)); - VNSvOutPortB(io_base + MAC_REG_CFG, *(pbyCxtBuf + MAC_REG_CFG)); + VNSvOutPortB(io_base + MAC_REG_CFG, *(cxt_buf + MAC_REG_CFG)); /* restore PS Config. */ for (ii = MAC_REG_PSCFG; ii < MAC_REG_BBREGCTL; ii++) - VNSvOutPortB(io_base + ii, *(pbyCxtBuf + ii)); + VNSvOutPortB(io_base + ii, *(cxt_buf + ii)); /* restore CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR */ VNSvOutPortD(io_base + MAC_REG_TXDMAPTR0, - *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0)); + *(unsigned long *)(cxt_buf + MAC_REG_TXDMAPTR0)); VNSvOutPortD(io_base + MAC_REG_AC0DMAPTR, - *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR)); + *(unsigned long *)(cxt_buf + MAC_REG_AC0DMAPTR)); VNSvOutPortD(io_base + MAC_REG_BCNDMAPTR, - *(unsigned long *)(pbyCxtBuf + MAC_REG_BCNDMAPTR)); + *(unsigned long *)(cxt_buf + MAC_REG_BCNDMAPTR)); VNSvOutPortD(io_base + MAC_REG_RXDMAPTR0, - *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0)); + *(unsigned long *)(cxt_buf + MAC_REG_RXDMAPTR0)); VNSvOutPortD(io_base + MAC_REG_RXDMAPTR1, - *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1)); + *(unsigned long *)(cxt_buf + MAC_REG_RXDMAPTR1)); } /*