From patchwork Sun Mar 6 12:57:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 8513331 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 EFE319F46A for ; Sun, 6 Mar 2016 12:57:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0905220172 for ; Sun, 6 Mar 2016 12:57:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82ACB20204 for ; Sun, 6 Mar 2016 12:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623AbcCFM5p (ORCPT ); Sun, 6 Mar 2016 07:57:45 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34798 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbcCFM5e (ORCPT ); Sun, 6 Mar 2016 07:57:34 -0500 Received: by mail-wm0-f65.google.com with SMTP id p65so6295132wmp.1 for ; Sun, 06 Mar 2016 04:57:33 -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=Nlk2WFBJt30XXQq+nLOKVniUb78GYGv9erbpZO+ISfI=; b=1H3TojKi34QImpY8BxZqJ2bQ7DOQKCJLP5WWUMEkyKE92TKnIrs85AGp6vlmhw4uYT f4FElKBYsxgTMDBG5rlIbdZS56hRBvvK/3gneEhTWgsL91cATz1U4Q+K9faAg77r/aHC JnxS26CSO2jUPHrh8C7CT66hNOOMzVqoah8LhiDw8+pp4UpO1u3ZqPpplM7ooPvOfhlb eBYTI0k67b21mYATCRvwO9Ir/GQ01EqlKQu35j1BuueH9aQyKaukv+UUzxqhGBmsPmRP oVBEJzwrg1v/PXK/P5n5knIw0b1S8o8pJEJie1WMPg8BWtsj3FugNIXDpty2FypRNbjx ZNuA== 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=Nlk2WFBJt30XXQq+nLOKVniUb78GYGv9erbpZO+ISfI=; b=b7nf7Wv4WUlYKVZfI/DcAO2V9IPYsZOb5Z8pM4iY2WaoiP77/r5nOy/i5z6S6Ffa6s 5aVVhjZ6vnhO/jNUWDnc6Y7J4MaP+5064LMNeM/0SeU3Ln2Y+xX7YxjbdIInvJ4i5iRq ViVCfA4+SdU6LmQIjlzBNVvUfWngiCTwI1Qk+TKRwgqCuRRatpMWf8k+Lx+UuLzUEtmJ oKR+8GX4T/+Msci11l3nI2v8hOUKUl2KEQGDVSq8iNDsWlOgU7JC2ceHzEo1tp4edEAK cK4h9tEw+5SGy5KJ8Q8qGV6TWX4XmaLoo6nlBGnMlUT3GLCpRFoDGzr7UDRdRFQgeNWQ jRNQ== X-Gm-Message-State: AD7BkJLD814cvya/TDx4ExdeSfv4jmkAGJwlPY4vrVZaCHqs5I0+UbT3d2RJhHspPd0Dhg== X-Received: by 10.28.11.131 with SMTP id 125mr8240917wml.58.1457269053283; Sun, 06 Mar 2016 04:57:33 -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.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 04:57:32 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 09/13] staging: vt6655: mac.c replace VNSvInPortB with ioread8 Date: Sun, 6 Mar 2016 12:57:08 +0000 Message-Id: <1457269032-2681-9-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 Removing the macro from functions. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/mac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index ece2bf0..a1be62d 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -558,7 +558,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) unsigned short ww; unsigned char byOrgDMACtl; - VNSvInPortB(io_base + MAC_REG_RXDMACTL0, &byOrgDMACtl); + byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0 + 2); @@ -592,7 +592,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) unsigned short ww; unsigned char byOrgDMACtl; - VNSvInPortB(io_base + MAC_REG_RXDMACTL1, &byOrgDMACtl); + byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL1); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1 + 2); @@ -628,7 +628,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, unsigned short ww; unsigned char byOrgDMACtl; - VNSvInPortB(io_base + MAC_REG_TXDMACTL0, &byOrgDMACtl); + byOrgDMACtl = ioread8(io_base + MAC_REG_TXDMACTL0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0 + 2); @@ -664,7 +664,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, unsigned short ww; unsigned char byOrgDMACtl; - VNSvInPortB(io_base + MAC_REG_AC0DMACTL, &byOrgDMACtl); + byOrgDMACtl = ioread8(io_base + MAC_REG_AC0DMACTL); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL + 2); @@ -713,7 +713,7 @@ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay) iowrite8((TMCTL_TMD | TMCTL_TE), io_base + MAC_REG_TMCTL0); for (ii = 0; ii < 66; ii++) { /* assume max PCI clock is 66Mhz */ for (uu = 0; uu < uDelay; uu++) { - VNSvInPortB(io_base + MAC_REG_TMCTL0, &byValue); + byValue = ioread8(io_base + MAC_REG_TMCTL0); if ((byValue == 0) || (byValue & TMCTL_TSUSP)) { iowrite8(0, io_base + MAC_REG_TMCTL0);