From patchwork Sun Mar 6 12:57:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513291 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 71283C0553 for ; Sun, 6 Mar 2016 12:57:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8043E20172 for ; Sun, 6 Mar 2016 12:57:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EFC62017D for ; Sun, 6 Mar 2016 12:57:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751577AbcCFM5g (ORCPT ); Sun, 6 Mar 2016 07:57:36 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35813 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512AbcCFM5a (ORCPT ); Sun, 6 Mar 2016 07:57:30 -0500 Received: by mail-wm0-f66.google.com with SMTP id 1so6277362wmg.2 for ; Sun, 06 Mar 2016 04:57:29 -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=I46GdbNQ1VR6k2Lh1bM0gYtE2y45VfePSaJBK2JD+5Y=; b=BOJ3pfion5rC0P5mH+ilzoVQTrigopKpFlv1Zr9hR4IyHyIRS6D+6C8YB5RSYvpRqX xEN0NBR/R3LkPMoIeufB50Ir4+mw8PrM+fiBAsu81AeCnmiMgCns/DKnz/JfMdgma1vY xNdmGybcvnzzveAxd0RDQ/U+FVn3PR19OiNxtLarcKoM5nSw5NZOtmXhHam1OfrJgd7m dARenyYDEwNYq/hqU7VXGSQEaIRURbppWvV292CGs/HocLk1ick5a6WE83oRFY6/ZS7K 5it86RXM0WIZYi88xj9uzWkWWCp3CTqTWWZLTmb4BYTTMJcWd6ckeToyzpQBZcXJjhPB 2TNg== 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=I46GdbNQ1VR6k2Lh1bM0gYtE2y45VfePSaJBK2JD+5Y=; b=ZikgnEuS9Q7uUVGtQlVvV9fLGr565ipgBzgGYY8X9jPK0pk97XH82VPptY2UV7aSFB daHcUqD1N5/QudZSJZFLgMOmNzcQzh+k2NqdoqBQA9Y4JM06dde83tyXzRT8HynStu7Z T3KSU6qV3TDospcfKV9prFlIDjN44vqxZ8E2d+ud5eWQptmn9GGaZE5Kq0QV/Ld87L61 9bZYP0O7//W5GKNQEs8I9pcHDPkdxolB5VHO6ojOqm/Vfcaqdlbu1bnNOpVEsNGmiryg 1A4zKzLRMuPFoAGdK0zOOOhqlzhqAn8GKKmE8NnQxGfvn9zL7Iv5/Rg9tqn72nj9SSM9 Q2EA== X-Gm-Message-State: AD7BkJKLi2Cf0itumCvGjGUy6dYkg6hbSkBk+5oYlOfv0WFpzhzn2rdjuA1jkHUMnEiXlg== X-Received: by 10.28.9.19 with SMTP id 19mr8169214wmj.87.1457269049260; Sun, 06 Mar 2016 04:57:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:28 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 05/13] staging: vt6655: mac.c replace VNSvOutPortW with iowrite16 Date: Sun, 6 Mar 2016 12:57:04 +0000 Message-Id: <1457269032-2681-5-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 removig macro from functions. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/mac.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index a9ddb95..43e5f66 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -757,9 +757,9 @@ void MACvSetMISCFifo(struct vnt_private *priv, unsigned short wOffset, if (wOffset > 273) return; - VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset); + iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); - VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); + iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); } bool MACbPSWakeup(struct vnt_private *priv) @@ -826,9 +826,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, pr_debug("1. wOffset: %d, Data: %X, KeyCtl:%X\n", wOffset, dwData, wKeyCtl); - VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset); + iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); - VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); + iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); wOffset++; dwData = 0; @@ -841,9 +841,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, dwData |= *(pbyAddr+0); pr_debug("2. wOffset: %d, Data: %X\n", wOffset, dwData); - VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset); + iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); - VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); + iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); wOffset++; wOffset += (uKeyIdx * 4); @@ -851,9 +851,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, /* always push 128 bits */ pr_debug("3.(%d) wOffset: %d, Data: %X\n", ii, wOffset+ii, *pdwKey); - VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset+ii); + iowrite16(wOffset + ii, io_base + MAC_REG_MISCFFNDEX); iowrite32(*pdwKey++, io_base + MAC_REG_MISCFFDATA); - VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); + iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); } } @@ -879,7 +879,7 @@ void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx) wOffset = MISCFIFO_KEYETRY0; wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); - VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset); + iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX); iowrite32(0, io_base + MAC_REG_MISCFFDATA); - VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); + iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); }