From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E58D7C433EF for ; Sat, 2 Apr 2022 07:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238909AbiDBHb2 (ORCPT ); Sat, 2 Apr 2022 03:31:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238857AbiDBHbQ (ORCPT ); Sat, 2 Apr 2022 03:31:16 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECFC0174E92 for ; Sat, 2 Apr 2022 00:29:23 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id o10so10170854ejd.1 for ; Sat, 02 Apr 2022 00:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=HVq5l4DEGGu5eDsQOm9+fxU3g/O+ru6NFRfeksiXUpY=; b=nMzCegp4ex+gSCJ5748N8CSkptydtg96MXwKP+c5MwrPRbQ/rbCwPcMc0038+NfXKG 3pGDAqepOL5TRAIiHlkUKAWv1dvfKxdUDUOye2HGiRY9h0VfGfBuIK3Gf8T8BSLu00bQ u4bX0tJi7NXcI2n8Vp+ZPgqdXBu/sEy7uxIO229lHpNbEEe1ceWm6Zh5zTqyAtOkbqO1 AtOC3K4DQyZzx5384FuQ2wjRncZ08phZCyoHAsHya4DH45VnryNweSA//71Ykz4+RBJE S29xG9j9qIu8aUHu6ju6qpOdIQWKnxmU4isNvqH8+updFhlH/ObBJJItd80Fh6TOsBps NSmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HVq5l4DEGGu5eDsQOm9+fxU3g/O+ru6NFRfeksiXUpY=; b=vNQf3EB4APCnLDDznEFMxmO/4iQfyd7Kt+rO19ukm92xi3vvI4UKyJzkBHQh9ropV7 tLTBYtDS9hO2ESd/w0nHccxLnHYgHUlCbBLio1NDdCzbrmGZWY3F/dF9MftUNw4nPlFG w2BNe9wQUzUlVo2ghMClzU+/2ZAPDHurgl80bV59PIjOBPpLWbtVZwW5fY+zSvkyq2NC QMvGnzYkRBpvP1tlB/0GrwQIO/Kx3m7/UfTvhSgQ5IRziinCAC6dZ8hskAhUTd5MEb05 mGWzQCKc+d6PIQS66kqv3MZ/r8YEKF1+CNYF41O/yZRXV6u1Jf09/f7BG9GZqwvJ4L5b cXkg== X-Gm-Message-State: AOAM533pSLl4kXvIKjcoTCggqEP+NmcO0AtgUsIp9CHxgVGereqoGrj5 K+bLlX6Na5S/kR715FP0ipU= X-Google-Smtp-Source: ABdhPJyaelKkWpK/klTy7DyTRaqYPKpyimKx2n2JdfVCIaLph+RadQ5xtzftJJ43D8M9AqYZNRHdQQ== X-Received: by 2002:a17:906:d789:b0:6e0:bdd5:a884 with SMTP id pj9-20020a170906d78900b006e0bdd5a884mr2861344ejb.201.1648884562487; Sat, 02 Apr 2022 00:29:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id y27-20020a170906519b00b006dfaf4466ebsm1822635ejk.116.2022.04.02.00.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:22 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:20 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] staging: vt6655: Remove unused macros with do while(0) Message-ID: <8e1ff43ff0bd636d0a64c977291bb06eee3a1ab6.1648882847.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused macros with do-while(0) loop in mac.h as they are not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 85 ------------------------------------ 1 file changed, 85 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 550dc4da80a9..c8bc4b6d2938 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -552,21 +552,6 @@ do { \ VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ } while (0) =20 -#define MACvDWordRegBitsOn(iobase, byRegOfs, dwBits) \ -do { \ - unsigned long dwData; \ - VNSvInPortD(iobase + byRegOfs, &dwData); \ - VNSvOutPortD(iobase + byRegOfs, dwData | (dwBits)); \ -} while (0) - -#define MACvRegBitsOnEx(iobase, byRegOfs, byMask, byBits) \ -do { \ - unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ - byData &=3D byMask; \ - VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ -} while (0) - #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ @@ -581,13 +566,6 @@ do { \ VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) =20 -#define MACvDWordRegBitsOff(iobase, byRegOfs, dwBits) \ -do { \ - unsigned long dwData; \ - VNSvInPortD(iobase + byRegOfs, &dwData); \ - VNSvOutPortD(iobase + byRegOfs, dwData & ~(dwBits)); \ -} while (0) - #define MACvGetCurrRx0DescAddr(iobase, pdwCurrDescAddr) \ VNSvInPortD(iobase + MAC_REG_RXDMAPTR0, \ (unsigned long *)pdwCurrDescAddr) @@ -622,24 +600,6 @@ do { \ VNSvOutPortW(iobase + MAC_REG_BCNDMACTL + 2, \ wCurrBCNLength) =20 -#define MACvReadBSSIDAddress(iobase, pbyEtherAddr) \ -do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvInPortB(iobase + MAC_REG_BSSID0, \ - (unsigned char *)pbyEtherAddr); \ - VNSvInPortB(iobase + MAC_REG_BSSID0 + 1, \ - pbyEtherAddr + 1); \ - VNSvInPortB(iobase + MAC_REG_BSSID0 + 2, \ - pbyEtherAddr + 2); \ - VNSvInPortB(iobase + MAC_REG_BSSID0 + 3, \ - pbyEtherAddr + 3); \ - VNSvInPortB(iobase + MAC_REG_BSSID0 + 4, \ - pbyEtherAddr + 4); \ - VNSvInPortB(iobase + MAC_REG_BSSID0 + 5, \ - pbyEtherAddr + 5); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ -} while (0) - #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ @@ -676,24 +636,6 @@ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) =20 -#define MACvWriteEtherAddress(iobase, pbyEtherAddr) \ -do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvOutPortB(iobase + MAC_REG_PAR0, \ - *pbyEtherAddr); \ - VNSvOutPortB(iobase + MAC_REG_PAR0 + 1, \ - *(pbyEtherAddr + 1)); \ - VNSvOutPortB(iobase + MAC_REG_PAR0 + 2, \ - *(pbyEtherAddr + 2)); \ - VNSvOutPortB(iobase + MAC_REG_PAR0 + 3, \ - *(pbyEtherAddr + 3)); \ - VNSvOutPortB(iobase + MAC_REG_PAR0 + 4, \ - *(pbyEtherAddr + 4)); \ - VNSvOutPortB(iobase + MAC_REG_PAR0 + 5, \ - *(pbyEtherAddr + 5)); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ -} while (0) - #define MACvClearISR(iobase) \ VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE) =20 @@ -759,26 +701,6 @@ do { \ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ } while (0) =20 -#define MACvTransmitSYNC(iobase) \ -do { \ - unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_SYNCDMACTL, &dwData); \ - if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE); \ - else \ - VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN); \ -} while (0) - -#define MACvTransmitATIM(iobase) \ -do { \ - unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_ATIMDMACTL, &dwData); \ - if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE); \ - else \ - VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN); \ -} while (0) - #define MACvTransmitBCN(iobase) \ VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) =20 @@ -861,13 +783,6 @@ do { \ #define MACvWriteATIMW(iobase, wCounter) \ VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter) =20 -#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC) \ -do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvOutPortW(iobase + byRegOfs, wCRC); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ -} while (0) - #define MACvGPIOIn(iobase, pbyValue) \ VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) =20 --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5D44C433F5 for ; Sat, 2 Apr 2022 07:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240184AbiDBHbc (ORCPT ); Sat, 2 Apr 2022 03:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238722AbiDBHbU (ORCPT ); Sat, 2 Apr 2022 03:31:20 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17BCD173F6D for ; Sat, 2 Apr 2022 00:29:29 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id i27so2995906ejd.9 for ; Sat, 02 Apr 2022 00:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=GBBvzxregCkjrG0nIJdKGZ1Gb8mYJTSvUt4XwV6bAho=; b=J2nnEKvnYT6lu3MNze+z0bnxPxwcnSdA9LjONIl7dziCuGf5C8CdES4pBwcIxOgBj3 pMyxuWURBbC//ZDkBuOuoISR8kiFXpvic2sMZr8Q/lYzvc71mQX898caW8MLxuACkT7y bejspNPOShI8hbYG/O8KdFBzC1eVluwwjMuG9MAqKWkG8gbNcRkdNxdQn0j9AZ01/vil NWxW33K2VAn/U6NhDrZE/MCHwcULl3ZBAk4k77cnOtj81wNROl7MByeqAK6m38cUD5JS Jxn/fgNFdS8w7mLHYwk7Tz/4PXI+lD8XfM+MatqRDZMIVoxfuEJQAX2WRb2Utr7t3BTW QCAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GBBvzxregCkjrG0nIJdKGZ1Gb8mYJTSvUt4XwV6bAho=; b=NCIqjitB1HSOONVdJnRMmb65tzwKL48RtAQ4OAk6JFKA2evOVJU8Qhlpq+ifdDFiNI 6Kgkammk+8W/NSJtlPPUKIhehevO62skosiIw31P5rtdiaP1AX7U53DvExIrnDXatA1g RvCiGiu5WSzutn9NcG2cifjn6BQUB0K6Xn5zrqGsAnfYDV9B4rNTlZ2/qGNgVGDfisBe SRj3bRndblhrvvt6OI+9s6ablY9zB63natEyfS6xPHY5fj5hwDnVBxYWiUcJ/edjWP3a C0s+6Pv2FtgWuYI1MamlFkGXzsf5GHTckhH/J3ntzw0BWaGiSyMOo1hx+hMh9Qu4QMEz yXvA== X-Gm-Message-State: AOAM532Ctn9BkPythc8IcfOGkkuQbBz7eDSkIp8NApCEyPFLZVquFOEe f3F371nb/uVve9sb4FGuoSk= X-Google-Smtp-Source: ABdhPJz65PPWYyuQAdbFCSwkQLSiZH6e642nFJdVdQez6ZsW2j3S/PMHGZ4BlimY1Y3H22ly876suQ== X-Received: by 2002:a17:906:6a17:b0:6e1:13c3:e35c with SMTP id qw23-20020a1709066a1700b006e113c3e35cmr2944056ejc.760.1648884567601; Sat, 02 Apr 2022 00:29:27 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id v17-20020a170906339100b006e11af84acasm1813424eja.128.2022.04.02.00.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:27 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:25 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] staging: vt6655: Remove unused macros with CamelCase in mac.h Message-ID: <646acd285c1239f301692456bd9f46eda449d02b.1648882847.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused macros with CamelCase variables in mac.h as they are not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 48 ------------------------------------ 1 file changed, 48 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index c8bc4b6d2938..a1576e006d69 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -566,30 +566,6 @@ do { \ VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) =20 -#define MACvGetCurrRx0DescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_RXDMAPTR0, \ - (unsigned long *)pdwCurrDescAddr) - -#define MACvGetCurrRx1DescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_RXDMAPTR1, \ - (unsigned long *)pdwCurrDescAddr) - -#define MACvGetCurrTx0DescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_TXDMAPTR0, \ - (unsigned long *)pdwCurrDescAddr) - -#define MACvGetCurrAC0DescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_AC0DMAPTR, \ - (unsigned long *)pdwCurrDescAddr) - -#define MACvGetCurrSyncDescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_SYNCDMAPTR, \ - (unsigned long *)pdwCurrDescAddr) - -#define MACvGetCurrATIMDescAddr(iobase, pdwCurrDescAddr) \ - VNSvInPortD(iobase + MAC_REG_ATIMDMAPTR, \ - (unsigned long *)pdwCurrDescAddr) - /* set the chip with current BCN tx descriptor address */ #define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr) \ VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR, \ @@ -636,9 +612,6 @@ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) =20 -#define MACvClearISR(iobase) \ - VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE) - #define MACvStart(iobase) \ VNSvOutPortB(iobase + MAC_REG_HOSTCR, \ (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) @@ -646,18 +619,9 @@ do { \ #define MACvRx0PerPktMode(iobase) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) =20 -#define MACvRx0BufferFillMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) - #define MACvRx1PerPktMode(iobase) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) =20 -#define MACvRx1BufferFillMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) - -#define MACvRxOn(iobase) \ - MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON) - #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ @@ -678,9 +642,6 @@ do { \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ } while (0) =20 -#define MACvTxOn(iobase) \ - MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON) - #define MACvTransmit0(iobase) \ do { \ unsigned long dwData; \ @@ -733,9 +694,6 @@ do { \ #define MACvReadMIBCounter(iobase, pdwCounter) \ VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) =20 -#define MACvPwrEvntDisable(iobase) \ - VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000) - #define MACvEnableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ @@ -777,12 +735,6 @@ do { \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 -#define MACvReadATIMW(iobase, pwCounter) \ - VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter) - -#define MACvWriteATIMW(iobase, wCounter) \ - VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter) - #define MACvGPIOIn(iobase, pbyValue) \ VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) =20 --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 001F0C4332F for ; Sat, 2 Apr 2022 07:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240846AbiDBHbf (ORCPT ); Sat, 2 Apr 2022 03:31:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240064AbiDBHbZ (ORCPT ); Sat, 2 Apr 2022 03:31:25 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01E82174E82 for ; Sat, 2 Apr 2022 00:29:33 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id dr20so10096223ejc.6 for ; Sat, 02 Apr 2022 00:29:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=OH8RZ4OIzhVJTj6gW8TRG+Xxd32IsFfZ6Emdp764vYI=; b=CBPOL+qENhXL+CPBSso8tY02v1TtdY5Ezr19BsGbZCM6GiMKRsrpQDgLa4/oEcpOya V21x10jj8SzE2awlpDIYNf1nN0b3ARhCjYl5n4DDZ1GUi9OSoedEXgR7k+zE+CTFjKEK zkU2ng7pNiprCKWQEOgNPMvltdh+V/+3rbkNABGdZitsv7EGIO4mnje2HKUOyMbqaGWS Q9N7KduN5pDKY7xgxHzOakSKDAUyrHyRXXzbbpOcroLGkROK5q614QuFhbTDKiv5F3Jc CMe60ug4MJdDnlj5b1AO67hfD1iRShPNpdSKwuoiPmUhaObnNyJkYGmkA4yAwC+GNonZ WXPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=OH8RZ4OIzhVJTj6gW8TRG+Xxd32IsFfZ6Emdp764vYI=; b=EFK1jts2LcG2+0VhNVvWKt2iNJXSWpClnAe35JjoXuYgYI1jOqUlNiGqG+ymPBvLMK vrmE8fy8jw7PMFs10cUzMfzYico6ASst/LwmOQcr3orh0+NVGmJkazTQvJZSpzTEHvRN BKy2ObasDtJo3vyQddLozs0uBrHeotKJrdDIE5gXN88gnrwUhPSiMoKKdianmBp++Sz2 1Y/f/wzlJWn1U12pkV1Wcr+gnbLtvHwNl0+n+4+O6Pr8Q8468q1eh/rJVnsLg1mPhLyJ +5crlTzZEJFLD4s5x+dbsRrCG2GHNlBQ8IPhnzGZfeviK0HMTuqa4PpQHT72gMuqTV9f t74Q== X-Gm-Message-State: AOAM531qT4sQiXtCUc1buZVBlHeiDiQUDglfnRWtAWW2aDomb3sFCHi/ o6KxrEyFLxOsflwBuPyYWSU= X-Google-Smtp-Source: ABdhPJzyxuh//5B3BXtYXfFKg4wcXx+0DYbN3eTbRNKfVHw0CuppwJGGACNW1HZ2wt3rLtgj6L4dAg== X-Received: by 2002:a17:907:3e1a:b0:6e0:5ba8:8e0f with SMTP id hp26-20020a1709073e1a00b006e05ba88e0fmr2781838ejc.581.1648884572210; Sat, 02 Apr 2022 00:29:32 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id fx3-20020a170906b74300b006daecedee44sm1800489ejb.220.2022.04.02.00.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:31 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:29 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] staging: vt6655: Rename constant definitions with CamelCase Message-ID: <3e2c464b7e67667ac135c555d78be9da2c3bb318.1648882847.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constant definitions with CamelCase in mac.h as they are not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index a1576e006d69..6221351c6400 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -261,18 +261,18 @@ #define TFTCTL_TSFCNTREN 0x01 =20 /* Bits in the EnhanceCFG register */ -#define EnCFG_BarkerPream 0x00020000 -#define EnCFG_NXTBTTCFPSTR 0x00010000 -#define EnCFG_BcnSusClr 0x00000200 -#define EnCFG_BcnSusInd 0x00000100 -#define EnCFG_CFP_ProtectEn 0x00000040 -#define EnCFG_ProtectMd 0x00000020 -#define EnCFG_HwParCFP 0x00000010 -#define EnCFG_CFNULRSP 0x00000004 -#define EnCFG_BBType_MASK 0x00000003 -#define EnCFG_BBType_g 0x00000002 -#define EnCFG_BBType_b 0x00000001 -#define EnCFG_BBType_a 0x00000000 +#define ENCFG_BARKERPREAM 0x00020000 +#define ENCFG_NXTBTTCFPSTR 0x00010000 +#define ENCFG_BCNSUSCLR 0x00000200 +#define ENCFG_BCNSUSIND 0x00000100 +#define ENCFG_CFP_PROTECTEN 0x00000040 +#define ENCFG_PROTECTMD 0x00000020 +#define ENCFG_HWPARCFP 0x00000010 +#define ENCFG_CFNULRSP 0x00000004 +#define ENCFG_BBTYPE_MASK 0x00000003 +#define ENCFG_BBTYPE_G 0x00000002 +#define ENCFG_BBTYPE_B 0x00000001 +#define ENCFG_BBTYPE_A 0x00000000 =20 /* Bits in the Page1Sel register */ #define PAGE1_SEL 0x01 @@ -497,7 +497,7 @@ #define MAC_LB_INTERNAL 0x01 #define MAC_LB_NONE 0x00 =20 -#define Default_BI 0x200 +#define DEFAULT_BI 0x200 =20 /* MiscFIFO Offset */ #define MISCFIFO_KEYETRY0 32 @@ -698,7 +698,7 @@ do { \ do { \ unsigned long dwOrgValue; \ VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ - dwOrgValue =3D dwOrgValue | EnCFG_ProtectMd; \ + dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 @@ -706,7 +706,7 @@ do { \ do { \ unsigned long dwOrgValue; \ VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ - dwOrgValue =3D dwOrgValue & ~EnCFG_ProtectMd; \ + dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 @@ -714,7 +714,7 @@ do { \ do { \ unsigned long dwOrgValue; \ VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ - dwOrgValue =3D dwOrgValue | EnCFG_BarkerPream; \ + dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 @@ -722,7 +722,7 @@ do { \ do { \ unsigned long dwOrgValue; \ VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ - dwOrgValue =3D dwOrgValue & ~EnCFG_BarkerPream; \ + dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 @@ -730,7 +730,7 @@ do { \ do { \ unsigned long dwOrgValue; \ VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ - dwOrgValue =3D dwOrgValue & ~EnCFG_BBType_MASK; \ + dwOrgValue =3D dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue =3D dwOrgValue | (unsigned long)byTyp; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 554B6C43217 for ; Sat, 2 Apr 2022 07:29:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241680AbiDBHbj (ORCPT ); Sat, 2 Apr 2022 03:31:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238843AbiDBHb3 (ORCPT ); Sat, 2 Apr 2022 03:31:29 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73E5C174E9B for ; Sat, 2 Apr 2022 00:29:38 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id ot30so219557ejb.12 for ; Sat, 02 Apr 2022 00:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=4G2eTtmdTWzx59Z9S8k6mI4CBAhKNnZVSSLyslzji70=; b=jkqKswMsP//Wzcxkixxy51XC8GWDhKyOIoCRqgS8wne69SZ3kaHPEKVjz+A84rBaTE 782M7Lh7ShnecbEVBKck4rB/gBMVasweXPQzOAGldooO5wTsHRfMT6Q3PwsvNZeNmjbN sed2/OOnAA+VqdqgvTs1YiA7NI+OXjXpPQ4CCMEB6smnIBuBTzKToqiIEDuLkDtTO/yh xjvfUQlNZA/M2WkZOaIFczvwaRC1qosyfdDfPfWcNH1slbcNRj6yaiB8U/ky0K4GwyQ7 6N73LVCE9hL18OnFc4jryAhmLJ7iGzIzB7fE5Hob1nPwQXz8yR4av5T8ZrWTTx5isZI8 MB+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4G2eTtmdTWzx59Z9S8k6mI4CBAhKNnZVSSLyslzji70=; b=qjyPSlueqpKYtVscF6XqoWMB4C6dklPpi3uKwruXyvBliFfGqWQb1ZUWD0bt5bb5o8 uxZPzobKwAsajvT5F+WdrxdDs52cwype773uSxwTzeiRFl2zj+frKoB450E26J/e9XgK WApBIq4Q1484fzR0VJ3mw/+YgpPtneHHQFkTK6Noi8p9L7AaWxBxTrYdk9B7kKIeXIVZ mT96vq9+e1PmJNga9a6mfU76UOFWaprR4Q2j97rF3FxBLwjbJVSXH6wJP7T0c/K0XTeE cAIcoA5fFPeQnUSPIcGmg46Osq2Niv3ZCk2WxCtvWSN3MDg5iAZOx69+0PfVTgzWfYqh aDWA== X-Gm-Message-State: AOAM530TeJsB2sJrrFyLn8y0B0JFs/cmKpsS6l1lvhYk6F36s5Kz7vnN a7wZviRTRvGn8gwB1/VLBeR/q2ibIoI= X-Google-Smtp-Source: ABdhPJxc+iM8FEq5gjKr9iH3MrjretjQ51iEc+ImyyfgRb9F5kc44u3Exrvv6NHLUG62LyJOSPtMew== X-Received: by 2002:a17:907:7e97:b0:6db:c1ef:6a68 with SMTP id qb23-20020a1709077e9700b006dbc1ef6a68mr2840176ejc.475.1648884577095; Sat, 02 Apr 2022 00:29:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id js24-20020a170906ca9800b006c8aeca8fe8sm1807682ejb.58.2022.04.02.00.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:36 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:34 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] staging: vt6655: Rename macro arguments with CamelCase Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename macro arguments with CamelCase in upc.h as they are not accepted by checkpatch.pl Removed datatype in macro arguments. Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/upc.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index b374db5fca81..f080a25e6cdf 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,34 +20,34 @@ =20 /* For memory mapped IO */ =20 -#define VNSvInPortB(dwIOAddress, pbyData) \ - (*(pbyData) =3D ioread8(dwIOAddress)) +#define VNSvInPortB(io_address, data) \ + (*(data) =3D ioread8(io_address)) =20 -#define VNSvInPortW(dwIOAddress, pwData) \ - (*(pwData) =3D ioread16(dwIOAddress)) +#define VNSvInPortW(io_address, data) \ + (*(data) =3D ioread16(io_address)) =20 -#define VNSvInPortD(dwIOAddress, pdwData) \ - (*(pdwData) =3D ioread32(dwIOAddress)) +#define VNSvInPortD(io_address, data) \ + (*(data) =3D ioread32(io_address)) =20 -#define VNSvOutPortB(dwIOAddress, byData) \ - iowrite8((u8)(byData), dwIOAddress) +#define VNSvOutPortB(io_address, data) \ + iowrite8((u8)(data), io_address) =20 -#define VNSvOutPortW(dwIOAddress, wData) \ - iowrite16((u16)(wData), dwIOAddress) +#define VNSvOutPortW(io_address, data) \ + iowrite16((u16)(data), io_address) =20 -#define VNSvOutPortD(dwIOAddress, dwData) \ - iowrite32((u32)(dwData), dwIOAddress) +#define VNSvOutPortD(io_address, data) \ + iowrite32((u32)(data), io_address) =20 -#define PCAvDelayByIO(uDelayUnit) \ +#define PCAvDelayByIO(u_delay_unit) \ do { \ - unsigned char __maybe_unused byData; \ + unsigned char __maybe_unused data; \ unsigned long ii; \ \ - if (uDelayUnit <=3D 50) { \ - udelay(uDelayUnit); \ + if (u_delay_unit <=3D 50) { \ + udelay(u_delay_unit); \ } else { \ - for (ii =3D 0; ii < (uDelayUnit); ii++) \ - byData =3D inb(0x61); \ + for (ii =3D 0; ii < (u_delay_unit); ii++) \ + data =3D inb(0x61); \ } \ } while (0) =20 --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93810C433EF for ; Sat, 2 Apr 2022 07:30:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238843AbiDBHbv (ORCPT ); Sat, 2 Apr 2022 03:31:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239012AbiDBHbh (ORCPT ); Sat, 2 Apr 2022 03:31:37 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46205174EBE for ; Sat, 2 Apr 2022 00:29:43 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id c10so10039785ejs.13 for ; Sat, 02 Apr 2022 00:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=CQlpIpi3/YaMKcgTaXjL0OAk2KumhQFCyX/3jraq9vI=; b=BQLQo9ntHQHf5Qgqzh2QzrQ6rM8eHGHawyJeDMdHS126I+HILdCZzEylCYN/XkuNjZ uHuhMYX3oU8h9G3mWlWx+uXBS5HvgMgdzA8wcsSvDGr3nfZlesEahLBUijKZl7XasCUl N/ge0+ZXC9gqwXjeZY0f8vJS32j+niMI447RN+GmS5gpY480UJZaG1XXyn9Ih19dyNky Fe2hg9AjzLzU0vljV82qpnm1iPZtnl8w+k+5GvvAP8k4iyehSfRTjza8G/fsDC8bHq2Q 45nvVIUY7qKBNqW2/9dwR3pbEtEvJAIeuRW712cFRzXEIn4f1AOrFkJey4OnKL2RKt8k oXyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=CQlpIpi3/YaMKcgTaXjL0OAk2KumhQFCyX/3jraq9vI=; b=mHqiHeYSvz8qplaZzkSrgs/XRru+61B0bFYEvKTpwvC4D2OyPMd0SkmIAhPBaCEA1u nCU+t/bceqxSfq0OZCDDNsSclIs4A5WxUhZUN7bf/etkd7Z6AWFEkj5JuFwZrr4M4nce K2g/te8L1TNYctUAWY019aYZQBYZUvOWx27u8LREJBJGeokSmdpEiM4Lw1CddgABLW25 7JGtl254rrAy+aD49uF7Lkls7zZI66WMl+IaTX87nJjpRzPIxjRV/SB8hAyus/v3mc1T QyMJFBdRUuswGk9dvMOLrwMyDBPFR4ZLVtf6HIQNb/uIwq7bBoIKBxwKGWRo4nQVOwTS ho4g== X-Gm-Message-State: AOAM533Bz7A/CvZtLSggChOY/4YiYIRDadG/tDFEafMTUXNb/Rau9A5c VJj67susam04Zaf8Jj4QS2w= X-Google-Smtp-Source: ABdhPJxgaTPZ2XHs71rfpsgg4qe56uKl7E7cvczLOGYR8Snz5+IO6XjObBuAulUriWksBaqWlEHNAQ== X-Received: by 2002:a17:906:27d1:b0:6df:ccdd:1a8d with SMTP id k17-20020a17090627d100b006dfccdd1a8dmr2963100ejc.751.1648884581910; Sat, 02 Apr 2022 00:29:41 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id qk30-20020a1709077f9e00b006dfae33d969sm1827891ejc.216.2022.04.02.00.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:41 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:39 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] staging: vt6655: Rename macros VNSvInPortB,W,D Message-ID: <706153af40ea661da43e853281fd9ce0f7f4b221.1648882847.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename macros VNSvInPortB,W,D with CamelCase in upc.h as they are not accepted by checkpatch.pl Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/baseband.c | 6 ++-- drivers/staging/vt6655/card.c | 6 ++-- drivers/staging/vt6655/device_main.c | 4 +-- drivers/staging/vt6655/mac.h | 46 ++++++++++++++-------------- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/srom.c | 6 ++-- drivers/staging/vt6655/upc.h | 6 ++-- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index dfdb0ebf43b5..9279d15c371f 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1916,13 +1916,13 @@ bool bb_read_embedded(struct vnt_private *priv, uns= igned char by_bb_addr, MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value); + VNS_IN_PORTB(iobase + MAC_REG_BBREGCTL, &by_value); if (by_value & BBREGCTL_DONE) break; } =20 /* get BB data */ - VNSvInPortB(iobase + MAC_REG_BBREGDATA, pby_data); + VNS_IN_PORTB(iobase + MAC_REG_BBREGDATA, pby_data); =20 if (ww =3D=3D W_MAX_TIMEOUT) { pr_debug(" DBG_PORT80(0x30)\n"); @@ -1961,7 +1961,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsi= gned char by_bb_addr, MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value); + VNS_IN_PORTB(iobase + MAC_REG_BBREGCTL, &by_value); if (by_value & BBREGCTL_DONE) break; } diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 1110366fc415..43b7d16427a4 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -748,14 +748,14 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64= *pqwCurrTSF) =20 MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_TFTCTL, &data); + VNS_IN_PORTB(iobase + MAC_REG_TFTCTL, &data); if (!(data & TFTCTL_TSFCNTRRD)) break; } if (ww =3D=3D W_MAX_TIMEOUT) return false; - VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); - VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); + VNS_IN_PORTD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); + VNS_IN_PORTD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); =20 return true; } diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 897d70cf32b8..ec8726e2da7d 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *p= riv) MACvInitialize(priv); =20 /* Get Local ID */ - VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id); + VNS_IN_PORTB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id); =20 spin_lock_irqsave(&priv->lock, flags); =20 @@ -1513,7 +1513,7 @@ static void vnt_configure(struct ieee80211_hw *hw, =20 *total_flags &=3D FIF_ALLMULTI | FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC; =20 - VNSvInPortB(priv->port_offset + MAC_REG_RCR, &rx_mode); + VNS_IN_PORTB(priv->port_offset + MAC_REG_RCR, &rx_mode); =20 dev_dbg(&priv->pcid->dev, "rx mode in =3D %x\n", rx_mode); =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 6221351c6400..b45ff015b189 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -541,28 +541,28 @@ #define MACvRegBitsOn(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + VNS_IN_PORTB(iobase + byRegOfs, &byData); \ VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ } while (0) =20 #define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + VNS_IN_PORTW(iobase + byRegOfs, &wData); \ VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ } while (0) =20 #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + VNS_IN_PORTB(iobase + byRegOfs, &byData); \ VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits)); \ } while (0) =20 #define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + VNS_IN_PORTW(iobase + byRegOfs, &wData); \ VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) =20 @@ -597,17 +597,17 @@ do { \ #define MACvReadEtherAddress(iobase, pbyEtherAddr) \ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0, \ (unsigned char *)pbyEtherAddr); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 1, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 1, \ pbyEtherAddr + 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 2, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 2, \ pbyEtherAddr + 2); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 3, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 3, \ pbyEtherAddr + 3); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 4, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 4, \ pbyEtherAddr + 4); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 5, \ + VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 5, \ pbyEtherAddr + 5); \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) @@ -625,7 +625,7 @@ do { \ #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_RXDMACTL0, &dwData); \ + VNS_IN_PORTD(iobase + MAC_REG_RXDMACTL0, &dwData); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ else \ @@ -635,7 +635,7 @@ do { \ #define MACvReceive1(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_RXDMACTL1, &dwData); \ + VNS_IN_PORTD(iobase + MAC_REG_RXDMACTL1, &dwData); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ else \ @@ -645,7 +645,7 @@ do { \ #define MACvTransmit0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_TXDMACTL0, &dwData); \ + VNS_IN_PORTD(iobase + MAC_REG_TXDMACTL0, &dwData); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ else \ @@ -655,7 +655,7 @@ do { \ #define MACvTransmitAC0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_AC0DMACTL, &dwData); \ + VNS_IN_PORTD(iobase + MAC_REG_AC0DMACTL, &dwData); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ else \ @@ -668,13 +668,13 @@ do { \ #define MACvClearStckDS(iobase) \ do { \ unsigned char byOrgValue; \ - VNSvInPortB(iobase + MAC_REG_STICKHW, &byOrgValue); \ + VNS_IN_PORTB(iobase + MAC_REG_STICKHW, &byOrgValue); \ byOrgValue =3D byOrgValue & 0xFC; \ VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ } while (0) =20 #define MACvReadISR(iobase, pdwValue) \ - VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) + VNS_IN_PORTD(iobase + MAC_REG_ISR, pdwValue) =20 #define MACvWriteISR(iobase, dwValue) \ VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) @@ -692,12 +692,12 @@ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1) =20 #define MACvReadMIBCounter(iobase, pdwCounter) \ - VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) + VNS_IN_PORTD(iobase + MAC_REG_MIBCNTR, pdwCounter) =20 #define MACvEnableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -705,7 +705,7 @@ do { \ #define MACvDisableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -713,7 +713,7 @@ do { \ #define MACvEnableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -721,7 +721,7 @@ do { \ #define MACvDisableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -729,14 +729,14 @@ do { \ #define MACvSetBBType(iobase, byTyp) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue =3D dwOrgValue | (unsigned long)byTyp; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvGPIOIn(iobase, pbyValue) \ - VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) + VNS_IN_PORTB(iobase + MAC_REG_GPIOCTL1, pbyValue) =20 #define MACvSetRFLE_LatchBase(iobase) \ MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 4498c9d400f2..dad8d20ef10b 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -175,7 +175,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsig= ned long dwData) =20 /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortD(iobase + MAC_REG_IFREGCTL, &dwValue); + VNS_IN_PORTD(iobase + MAC_REG_IFREGCTL, &dwValue); if (dwValue & IFREGCTL_DONE) break; } diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 5cdbc24e8c45..53a565bbc0eb 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -66,7 +66,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, unsigned char byOrg; =20 byData =3D 0xFF; - VNSvInPortB(iobase + MAC_REG_I2MCFG, &byOrg); + VNS_IN_PORTB(iobase + MAC_REG_I2MCFG, &byOrg); /* turn off hardware retry for getting NACK */ VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY))); for (wNoACK =3D 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) { @@ -77,7 +77,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR); /* wait DONE be set */ for (wDelay =3D 0; wDelay < W_MAX_TIMEOUT; wDelay++) { - VNSvInPortB(iobase + MAC_REG_I2MCSR, &byWait); + VNS_IN_PORTB(iobase + MAC_REG_I2MCSR, &byWait); if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; PCAvDelayByIO(CB_DELAY_LOOP_WAIT); @@ -87,7 +87,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, break; } } - VNSvInPortB(iobase + MAC_REG_I2MDIPT, &byData); + VNS_IN_PORTB(iobase + MAC_REG_I2MDIPT, &byData); VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg); return byData; } diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index f080a25e6cdf..d271126a86b9 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,13 +20,13 @@ =20 /* For memory mapped IO */ =20 -#define VNSvInPortB(io_address, data) \ +#define VNS_IN_PORTB(io_address, data) \ (*(data) =3D ioread8(io_address)) =20 -#define VNSvInPortW(io_address, data) \ +#define VNS_IN_PORTW(io_address, data) \ (*(data) =3D ioread16(io_address)) =20 -#define VNSvInPortD(io_address, data) \ +#define VNS_IN_PORTD(io_address, data) \ (*(data) =3D ioread32(io_address)) =20 #define VNSvOutPortB(io_address, data) \ --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D066C433F5 for ; Sat, 2 Apr 2022 07:30:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242374AbiDBHcI (ORCPT ); Sat, 2 Apr 2022 03:32:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244091AbiDBHbq (ORCPT ); Sat, 2 Apr 2022 03:31:46 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F4B9174EA2 for ; Sat, 2 Apr 2022 00:29:48 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id bg10so10149842ejb.4 for ; Sat, 02 Apr 2022 00:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=UgmXQ65LCqfnu6AqhqLZmG8FG0znnwhRP6/0ELaH6bE=; b=I0rGqgA677Rkmr6mgMmldh4OOXkEpPvKSDuqfx0mWZCPY4NH/wv3QIp3pdM53yv/j1 q4TmBQm/422HTyVaflj6uTbHRA1iuvT4zuJ4yB4IukpnkbUapMxRdUASta6P3uSk9YYs u51EwjIaWzu5EY0TX0dg8mw7PtcBDO9A/0nTUKnp3NRWi0vYyG2IL7XP4Xjv+ks1/k15 k0oPFQHYU3h62/n9zKFtRO87UiZeZltUwzASgp+4Onp5DXDrY3RCjyNCatHNz2qjUHJQ ahkfNMsPPAyK1kKrOu0EP2PH5ehZ5L3N/tFPbmEB3dF99bGAVkJ6m6ag51XVHfh43tZJ hzCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=UgmXQ65LCqfnu6AqhqLZmG8FG0znnwhRP6/0ELaH6bE=; b=rhvnXaxUkopZu7IwQAv9Kl68CQwMrbOJBsrwB4RIARQJhnii9hXaJwf/Y5V3abY/3L Svh9h8AI7jaE2TswxlROgzbZwr5zZLEU59LTND8U0D0QN8n9GQD15pxGxT+B0PG9N0y2 ZRmyTJVCtbKphwBcic1F6sO8OLcwhTqsd5sd/D9c72EXYycte40c8D3valHpFDs7WSrX Mtl8cxYhLTXfg1WLGhfW24M+iJYDJgFCaLsM1l2LqnVWkWFoTkj44JcxOXC0mYDuzj6K wlL1eHdl4BjCS4pj5EBX19ZN8nWiHTmyIYV5jgRn/H2Ffrl8kzIGolqrBS05SmVSJy9O q/fw== X-Gm-Message-State: AOAM531+u8zUN6Q/SX94nHybuyVa+nyz7OGpqiAXILyEwcGgwc2mIYmI ngabFzFtdeCGPDkYGIxEC5w= X-Google-Smtp-Source: ABdhPJxSjxs7i6l8eOkJekJYHew97eTr7Ih7VEaRIpkFpIIR+NmWSx9Mwrw2NRi5Ea+lk3vU+w5Eqg== X-Received: by 2002:a17:907:728b:b0:6df:8f3b:28ae with SMTP id dt11-20020a170907728b00b006df8f3b28aemr2927627ejc.336.1648884586786; Sat, 02 Apr 2022 00:29:46 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id gt34-20020a1709072da200b006df6bb3db69sm1821498ejc.158.2022.04.02.00.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:46 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:44 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] staging: vt6655: Rename macros VNSvOutPortB,W,D Message-ID: <0fdcf2d95973719c2398819915239d47c5d4b34f.1648882847.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename macros VNSvOutPortB,W,D with CamelCase in upc.h as they are not accepted by checkpatch.pl Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/baseband.c | 10 ++-- drivers/staging/vt6655/card.c | 54 +++++++++---------- drivers/staging/vt6655/channel.c | 4 +- drivers/staging/vt6655/device_main.c | 26 +++++----- drivers/staging/vt6655/mac.h | 78 ++++++++++++++-------------- drivers/staging/vt6655/power.c | 4 +- drivers/staging/vt6655/rf.c | 12 ++--- drivers/staging/vt6655/rxtx.c | 4 +- drivers/staging/vt6655/srom.c | 10 ++-- drivers/staging/vt6655/upc.h | 6 +-- 10 files changed, 104 insertions(+), 104 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index 9279d15c371f..c995c7bd0545 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1910,7 +1910,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsig= ned char by_bb_addr, unsigned char by_value; =20 /* BB reg offset */ - VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr); + VNS_OUT_PORTB(iobase + MAC_REG_BBREGADR, by_bb_addr); =20 /* turn on REGR */ MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); @@ -1953,9 +1953,9 @@ bool bb_write_embedded(struct vnt_private *priv, unsi= gned char by_bb_addr, unsigned char by_value; =20 /* BB reg offset */ - VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr); + VNS_OUT_PORTB(iobase + MAC_REG_BBREGADR, by_bb_addr); /* set BB data */ - VNSvOutPortB(iobase + MAC_REG_BBREGDATA, by_data); + VNS_OUT_PORTB(iobase + MAC_REG_BBREGDATA, by_data); =20 /* turn on BBREGCTL_REGW */ MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); @@ -2014,7 +2014,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC4_RFMD2959[ii][0], byVT3253B0_AGC4_RFMD2959[ii][1]); =20 - VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); + VNS_OUT_PORTD(iobase + MAC_REG_ITRTMSET, 0x23); MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); } priv->abyBBVGA[0] =3D 0x18; @@ -2054,7 +2054,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); =20 - VNSvOutPortB(iobase + MAC_REG_ITRTMSET, 0x23); + VNS_OUT_PORTB(iobase + MAC_REG_ITRTMSET, 0x23); MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); =20 priv->abyBBVGA[0] =3D 0x14; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 43b7d16427a4..dead364539d3 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -239,25 +239,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u= 8 bb_type) =20 if (priv->bySIFS !=3D bySIFS) { priv->bySIFS =3D bySIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS); } if (priv->byDIFS !=3D byDIFS) { priv->byDIFS =3D byDIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS); } if (priv->byEIFS !=3D C_EIFS) { priv->byEIFS =3D C_EIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS); } if (priv->bySlot !=3D bySlot) { priv->bySlot =3D bySlot; - VNSvOutPortB(priv->port_offset + MAC_REG_SLOT, priv->bySlot); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_SLOT, priv->bySlot); =20 bb_set_short_slot_time(priv); } if (priv->byCWMaxMin !=3D byCWMaxMin) { priv->byCWMaxMin =3D byCWMaxMin; - VNSvOutPortB(priv->port_offset + MAC_REG_CWMAXMIN0, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_CWMAXMIN0, priv->byCWMaxMin); } =20 @@ -295,9 +295,9 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned = char byRxRate, qwTSFOffset =3D CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, local_tsf); /* adjust TSF, HW's TSF add TSF Offset reg */ - VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST, + VNS_OUT_PORTD(priv->port_offset + MAC_REG_TSFOFST, (u32)qwTSFOffset); - VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST + 4, + VNS_OUT_PORTD(priv->port_offset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32)); MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); @@ -328,11 +328,11 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, qwNextTBTT =3D CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); =20 /* set HW beacon interval */ - VNSvOutPortW(priv->port_offset + MAC_REG_BI, wBeaconInterval); + VNS_OUT_PORTW(priv->port_offset + MAC_REG_BI, wBeaconInterval); priv->wBeaconInterval =3D wBeaconInterval; /* Set NextTBTT */ - VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT + 4, + VNS_OUT_PORTD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); + VNS_OUT_PORTD(priv->port_offset + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); =20 @@ -555,7 +555,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) /* swap over to get correct write order */ swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); + VNS_OUT_PORTD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); =20 /* RSPINF_b_2 */ vnt_get_phy_field(priv, 14, @@ -564,7 +564,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); + VNS_OUT_PORTD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); =20 /* RSPINF_b_5 */ vnt_get_phy_field(priv, 14, @@ -573,7 +573,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); + VNS_OUT_PORTD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); =20 /* RSPINF_b_11 */ vnt_get_phy_field(priv, 14, @@ -582,42 +582,42 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_t= ype) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); + VNS_OUT_PORTD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); =20 /* RSPINF_a_6 */ s_vCalculateOFDMRParameter(RATE_6M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_6, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_9 */ s_vCalculateOFDMRParameter(RATE_9M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_9, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_12 */ s_vCalculateOFDMRParameter(RATE_12M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_12, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_18 */ s_vCalculateOFDMRParameter(RATE_18M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_18, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_24 */ s_vCalculateOFDMRParameter(RATE_24M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_24, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_36 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -625,7 +625,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_36, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_48 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -633,7 +633,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_48, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_54 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -641,7 +641,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_54, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime)); /* RSPINF_a_72 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, @@ -649,7 +649,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_72, + VNS_OUT_PORTW(priv->port_offset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); /* Set to Page0 */ MACvSelectPage0(priv->port_offset); @@ -810,8 +810,8 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, =20 qwNextTBTT =3D CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* Set NextTBTT */ - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); + VNS_OUT_PORTD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); + VNS_OUT_PORTD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); } =20 @@ -836,8 +836,8 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 = qwTSF, =20 qwTSF =3D CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32)); + VNS_OUT_PORTD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); + VNS_OUT_PORTD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32)); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); } diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/chan= nel.c index abe867814dc8..6bef64bc51cf 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -118,10 +118,10 @@ bool set_channel(struct vnt_private *priv, struct iee= e80211_channel *ch) /* set HW default power register */ MACvSelectPage1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_PWRCCK, priv->byCurPwr); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_PWROFDM, priv->byCurPwr); MACvSelectPage0(priv->port_offset); =20 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index ec8726e2da7d..69b75193c819 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -334,7 +334,7 @@ static void device_init_registers(struct vnt_private *p= riv) if (priv->local_id > REV_ID_VT3253_B1) { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_MSRCTL + 1, (MSRCTL1_TXPWR | MSRCTL1_CSAPAREN)); =20 MACvSelectPage0(priv->port_offset); @@ -349,9 +349,9 @@ static void device_init_registers(struct vnt_private *p= riv) MACvSetLongRetryLimit(priv, priv->byLongRetryLimit); =20 /* reset TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); /* enable TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); =20 /* initialize BBP registers */ bb_vt3253_init(priv); @@ -1060,8 +1060,8 @@ static void vnt_interrupt_process(struct vnt_private = *priv) =20 if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); - VNSvOutPortB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0); - VNSvOutPortW(priv->port_offset + + VNS_OUT_PORTB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0); + VNS_OUT_PORTW(priv->port_offset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); device_error(priv, isr); } @@ -1477,9 +1477,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw = *hw, =20 CARDvSetFirstNextTBTT(priv, conf->beacon_int); } else { - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); } } @@ -1526,18 +1526,18 @@ static void vnt_configure(struct ieee80211_hw *hw, if (priv->mc_list_count > 2) { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortD(priv->port_offset + + VNS_OUT_PORTD(priv->port_offset + MAC_REG_MAR0, 0xffffffff); - VNSvOutPortD(priv->port_offset + + VNS_OUT_PORTD(priv->port_offset + MAC_REG_MAR0 + 4, 0xffffffff); =20 MACvSelectPage0(priv->port_offset); } else { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortD(priv->port_offset + + VNS_OUT_PORTD(priv->port_offset + MAC_REG_MAR0, (u32)multicast); - VNSvOutPortD(priv->port_offset + + VNS_OUT_PORTD(priv->port_offset + MAC_REG_MAR0 + 4, (u32)(multicast >> 32)); =20 @@ -1561,7 +1561,7 @@ static void vnt_configure(struct ieee80211_hw *hw, rx_mode |=3D RCR_BSSID; } =20 - VNSvOutPortB(priv->port_offset + MAC_REG_RCR, rx_mode); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_RCR, rx_mode); =20 dev_dbg(&priv->pcid->dev, "rx mode out=3D %x\n", rx_mode); } @@ -1621,7 +1621,7 @@ static void vnt_reset_tsf(struct ieee80211_hw *hw, st= ruct ieee80211_vif *vif) struct vnt_private *priv =3D hw->priv; =20 /* reset TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); } =20 static const struct ieee80211_ops vnt_mac_ops =3D { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b45ff015b189..be59da1b04b9 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -542,61 +542,61 @@ do { \ unsigned char byData; \ VNS_IN_PORTB(iobase + byRegOfs, &byData); \ - VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ + VNS_OUT_PORTB(iobase + byRegOfs, byData | (byBits)); \ } while (0) =20 #define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ VNS_IN_PORTW(iobase + byRegOfs, &wData); \ - VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ + VNS_OUT_PORTW(iobase + byRegOfs, wData | (wBits)); \ } while (0) =20 #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ VNS_IN_PORTB(iobase + byRegOfs, &byData); \ - VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits)); \ + VNS_OUT_PORTB(iobase + byRegOfs, byData & ~(byBits)); \ } while (0) =20 #define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ VNS_IN_PORTW(iobase + byRegOfs, &wData); \ - VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ + VNS_OUT_PORTW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) =20 /* set the chip with current BCN tx descriptor address */ #define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr) \ - VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR, \ + VNS_OUT_PORTD(iobase + MAC_REG_BCNDMAPTR, \ dwCurrDescAddr) =20 /* set the chip with current BCN length */ #define MACvSetCurrBCNLength(iobase, wCurrBCNLength) \ - VNSvOutPortW(iobase + MAC_REG_BCNDMACTL + 2, \ + VNS_OUT_PORTW(iobase + MAC_REG_BCNDMACTL + 2, \ wCurrBCNLength) =20 #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0, \ + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 1); \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0, \ *(pbyEtherAddr)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 1, \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0 + 1, \ *(pbyEtherAddr + 1)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 2, \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0 + 2, \ *(pbyEtherAddr + 2)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 3, \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0 + 3, \ *(pbyEtherAddr + 3)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 4, \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0 + 4, \ *(pbyEtherAddr + 4)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 5, \ + VNS_OUT_PORTB(iobase + MAC_REG_BSSID0 + 5, \ *(pbyEtherAddr + 5)); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) =20 #define MACvReadEtherAddress(iobase, pbyEtherAddr) \ do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 1); \ VNS_IN_PORTB(iobase + MAC_REG_PAR0, \ (unsigned char *)pbyEtherAddr); \ VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 1, \ @@ -609,27 +609,27 @@ do { \ pbyEtherAddr + 4); \ VNS_IN_PORTB(iobase + MAC_REG_PAR0 + 5, \ pbyEtherAddr + 5); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) =20 #define MACvStart(iobase) \ - VNSvOutPortB(iobase + MAC_REG_HOSTCR, \ + VNS_OUT_PORTB(iobase + MAC_REG_HOSTCR, \ (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) =20 #define MACvRx0PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) =20 #define MACvRx1PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) =20 #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ VNS_IN_PORTD(iobase + MAC_REG_RXDMACTL0, &dwData); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ else \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ } while (0) =20 #define MACvReceive1(iobase) \ @@ -637,9 +637,9 @@ do { \ unsigned long dwData; \ VNS_IN_PORTD(iobase + MAC_REG_RXDMACTL1, &dwData); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ else \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ + VNS_OUT_PORTD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ } while (0) =20 #define MACvTransmit0(iobase) \ @@ -647,9 +647,9 @@ do { \ unsigned long dwData; \ VNS_IN_PORTD(iobase + MAC_REG_TXDMACTL0, &dwData); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ + VNS_OUT_PORTD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ else \ - VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ + VNS_OUT_PORTD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ } while (0) =20 #define MACvTransmitAC0(iobase) \ @@ -657,39 +657,39 @@ do { \ unsigned long dwData; \ VNS_IN_PORTD(iobase + MAC_REG_AC0DMACTL, &dwData); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ + VNS_OUT_PORTD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ else \ - VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ + VNS_OUT_PORTD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ } while (0) =20 #define MACvTransmitBCN(iobase) \ - VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) + VNS_OUT_PORTB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) =20 #define MACvClearStckDS(iobase) \ do { \ unsigned char byOrgValue; \ VNS_IN_PORTB(iobase + MAC_REG_STICKHW, &byOrgValue); \ byOrgValue =3D byOrgValue & 0xFC; \ - VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ + VNS_OUT_PORTB(iobase + MAC_REG_STICKHW, byOrgValue); \ } while (0) =20 #define MACvReadISR(iobase, pdwValue) \ VNS_IN_PORTD(iobase + MAC_REG_ISR, pdwValue) =20 #define MACvWriteISR(iobase, dwValue) \ - VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) + VNS_OUT_PORTD(iobase + MAC_REG_ISR, dwValue) =20 #define MACvIntEnable(iobase, dwMask) \ - VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) + VNS_OUT_PORTD(iobase + MAC_REG_IMR, dwMask) =20 #define MACvIntDisable(iobase) \ - VNSvOutPortD(iobase + MAC_REG_IMR, 0) + VNS_OUT_PORTD(iobase + MAC_REG_IMR, 0) =20 #define MACvSelectPage0(iobase) \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0) + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 0) =20 #define MACvSelectPage1(iobase) \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1) + VNS_OUT_PORTB(iobase + MAC_REG_PAGE1SEL, 1) =20 #define MACvReadMIBCounter(iobase, pdwCounter) \ VNS_IN_PORTD(iobase + MAC_REG_MIBCNTR, pdwCounter) @@ -699,7 +699,7 @@ do { \ unsigned long dwOrgValue; \ VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + VNS_OUT_PORTD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvDisableProtectMD(iobase) \ @@ -707,7 +707,7 @@ do { \ unsigned long dwOrgValue; \ VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + VNS_OUT_PORTD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvEnableBarkerPreambleMd(iobase) \ @@ -715,7 +715,7 @@ do { \ unsigned long dwOrgValue; \ VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + VNS_OUT_PORTD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvDisableBarkerPreambleMd(iobase) \ @@ -723,7 +723,7 @@ do { \ unsigned long dwOrgValue; \ VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + VNS_OUT_PORTD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvSetBBType(iobase, byTyp) \ @@ -732,7 +732,7 @@ do { \ VNS_IN_PORTD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue =3D dwOrgValue | (unsigned long)byTyp; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + VNS_OUT_PORTD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 #define MACvGPIOIn(iobase, pbyValue) \ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index 06066fa56dd5..a3dcc31d2112 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -52,10 +52,10 @@ void PSvEnablePowerSaving(struct vnt_private *priv, u16 wAID =3D priv->current_aid | BIT(14) | BIT(15); =20 /* set period of power up before TBTT */ - VNSvOutPortW(priv->port_offset + MAC_REG_PWBT, C_PWBT); + VNS_OUT_PORTW(priv->port_offset + MAC_REG_PWBT, C_PWBT); if (priv->op_mode !=3D NL80211_IFTYPE_ADHOC) { /* set AID */ - VNSvOutPortW(priv->port_offset + MAC_REG_AIDATIM, wAID); + VNS_OUT_PORTW(priv->port_offset + MAC_REG_AIDATIM, wAID); } =20 /* Set AutoSleep */ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index dad8d20ef10b..952339b36d56 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -171,7 +171,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsig= ned long dwData) unsigned short ww; unsigned long dwValue; =20 - VNSvOutPortD(iobase + MAC_REG_IFREGCTL, dwData); + VNS_OUT_PORTD(iobase + MAC_REG_IFREGCTL, dwData); =20 /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { @@ -207,7 +207,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) ret =3D true; =20 /* 3-wire control for normal mode */ - VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0); + VNS_OUT_PORTB(iobase + MAC_REG_SOFTPWRCTL, 0); =20 MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); @@ -238,7 +238,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) SOFTPWRCTL_TXPEINV)); =20 /* 3-wire control for power saving mode */ - VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 11= 00 0000 */ + VNS_OUT_PORTB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1= 100 0000 */ =20 return ret; } @@ -254,10 +254,10 @@ static bool RFbAL2230SelectChannel(struct vnt_private= *priv, unsigned char byCha ret &=3D IFRFbWriteEmbedded(priv, al2230_channel_table1[byChannel - 1]); =20 /* Set Channel[7] =3D 0 to tell H/W channel is changing now. */ - VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F)); + VNS_OUT_PORTB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F)); MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL2230); /* Set Channel[7] =3D 1 to tell H/W channel change is done. */ - VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80)); + VNS_OUT_PORTB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80)); =20 return ret; } @@ -350,7 +350,7 @@ bool rf_write_wake_prog_syn(struct vnt_private *priv, u= nsigned char rf_type, unsigned char sleep_count =3D 0; unsigned short idx =3D MISCFIFO_SYNDATA_IDX; =20 - VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0); + VNS_OUT_PORTW(iobase + MAC_REG_MISCFFNDEX, 0); switch (rf_type) { case RF_AIROHA: case RF_AL2230S: diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 53506e242a96..e6c7c1eef17b 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1450,9 +1450,9 @@ int vnt_beacon_make(struct vnt_private *priv, struct = ieee80211_vif *vif) int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif, struct ieee80211_bss_conf *conf) { - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); =20 - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + VNS_OUT_PORTB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); =20 CARDvSetFirstNextTBTT(priv, conf->beacon_int); =20 diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 53a565bbc0eb..1612c9702e31 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -68,13 +68,13 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, byData =3D 0xFF; VNS_IN_PORTB(iobase + MAC_REG_I2MCFG, &byOrg); /* turn off hardware retry for getting NACK */ - VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY))); + VNS_OUT_PORTB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY))); for (wNoACK =3D 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) { - VNSvOutPortB(iobase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID); - VNSvOutPortB(iobase + MAC_REG_I2MTGAD, byContntOffset); + VNS_OUT_PORTB(iobase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID); + VNS_OUT_PORTB(iobase + MAC_REG_I2MTGAD, byContntOffset); =20 /* issue read command */ - VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR); + VNS_OUT_PORTB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR); /* wait DONE be set */ for (wDelay =3D 0; wDelay < W_MAX_TIMEOUT; wDelay++) { VNS_IN_PORTB(iobase + MAC_REG_I2MCSR, &byWait); @@ -88,7 +88,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, } } VNS_IN_PORTB(iobase + MAC_REG_I2MDIPT, &byData); - VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg); + VNS_OUT_PORTB(iobase + MAC_REG_I2MCFG, byOrg); return byData; } =20 diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index d271126a86b9..7d5075ec3162 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -29,13 +29,13 @@ #define VNS_IN_PORTD(io_address, data) \ (*(data) =3D ioread32(io_address)) =20 -#define VNSvOutPortB(io_address, data) \ +#define VNS_OUT_PORTB(io_address, data) \ iowrite8((u8)(data), io_address) =20 -#define VNSvOutPortW(io_address, data) \ +#define VNS_OUT_PORTW(io_address, data) \ iowrite16((u16)(data), io_address) =20 -#define VNSvOutPortD(io_address, data) \ +#define VNS_OUT_PORTD(io_address, data) \ iowrite32((u32)(data), io_address) =20 #define PCAvDelayByIO(u_delay_unit) \ --=20 2.25.1 From nobody Fri Jun 19 14:33:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19B80C433F5 for ; Sat, 2 Apr 2022 07:30:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239012AbiDBHcA (ORCPT ); Sat, 2 Apr 2022 03:32:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352067AbiDBHbr (ORCPT ); Sat, 2 Apr 2022 03:31:47 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7F341DEA85 for ; Sat, 2 Apr 2022 00:29:53 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id c10so10040258ejs.13 for ; Sat, 02 Apr 2022 00:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=GQIynQ3bcr2B2Ezgs0ZsVUHSLQcz4dHVvcopVnG+tyE=; b=QD1SWZVErB3vqYcXw/ZCfyN4gLad2PktALbBk2X8iiJKOEupoptF3Lxf3rx/yr+sOY 7jzkwvya/qORHs1Crk9jVLFbPHHeNuDthdVDuGuW27JGgtB151KXXL3aFcZMuWT689cW 24xt8uWIV1yCjmSwNuw7QOuj+4WR9c3dbFuxRfP8a+mswcirtIZZpiwzU6h7SvR4OuAL 6P/ywHRlbSRp/bCthL/itKDB+2p27Q9orJDvR/3GbaU9SXee2QLHycgwNQ1Mtm0Oy/Vh SmxNszRBZ6mOg03VP+pAvIavIPLQMxsCH/kNxczrd/geX2gXCFa0R7IJ+irnWbaAuTr2 5XTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GQIynQ3bcr2B2Ezgs0ZsVUHSLQcz4dHVvcopVnG+tyE=; b=HMXH/yvmBjO4UfJx1QweXsnkNIeYjzmIYYtH2tUonb8gDSu7J4Ijw0xJgBU5OvBZnP zxMiCJekXwDSQL5KUtsaKKjWLHXQYd1xdEUp3vTw74b2mizhBxdurfy6H2uMmEsWeW7F f8PT2fqxWxHaBburGQt+Y/vT8TYsUcCJ5AZLCrhZDJsg+wyoz9qWeerxrW+ue1hC6COx yKDkq510WFfGjvOXnKpCGAfvUJM3U1nd8gD0Gb1O8krrjen7rVz2JYHhYjcCsID7XaMn TVecF+hI0UswNU6+lgE2WS4hbJ6Pza94hVq6pcoEPwR9lqP2hMztU/GxXOkEKo1TUJ/h AzqQ== X-Gm-Message-State: AOAM533Fqb9XuxC+X5DpqeBJkvToXbIgy584RDz3Hl+7QIQNLBkhO+mn s7DtFcFqP6nFcBGybd9nAjwrVv/FWKg= X-Google-Smtp-Source: ABdhPJwPCRB53/y4teq4/3Q59TCXEeANxyoBE5/hQoHZfLgq1iPRvzkiFI0BeNWHfyax77j+lSF3Ow== X-Received: by 2002:a17:906:8a6d:b0:6e0:68ac:7197 with SMTP id hy13-20020a1709068a6d00b006e068ac7197mr2996202ejc.703.1648884592132; Sat, 02 Apr 2022 00:29:52 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id t19-20020a056402525300b0041952a1a764sm2114882edd.33.2022.04.02.00.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 00:29:51 -0700 (PDT) Date: Sat, 2 Apr 2022 09:29:49 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] staging: vt6655: Convert macro PCAvDelayByIO to function Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert do-while(0) macro PCAvDelayByIO to function and relocate. Signed-off-by: Philipp Hortmann Reported-by: kernel test robot --- drivers/staging/vt6655/srom.c | 13 +++++++++++++ drivers/staging/vt6655/srom.h | 2 ++ drivers/staging/vt6655/upc.h | 13 ------------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 1612c9702e31..8373aa783d76 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -139,3 +139,16 @@ void SROMvReadEtherAddress(void __iomem *iobase, pbyEtherAddress++; } } + +void PCAvDelayByIO(unsigned char u_delay_unit) +{ + unsigned char data; + unsigned long ii; + + if (u_delay_unit <=3D 50) { + udelay(u_delay_unit); + } else { + for (ii =3D 0; ii < (u_delay_unit); ii++) + data =3D inb(0x61); + } +} diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index b03073ffa18a..c34523c77d02 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h @@ -82,4 +82,6 @@ void SROMvReadAllContents(void __iomem *iobase, unsigned = char *pbyEepromRegs); void SROMvReadEtherAddress(void __iomem *iobase, unsigned char *pbyEtherAddress); =20 +void PCAvDelayByIO(unsigned char u_delay_unit); + #endif /* __EEPROM_H__*/ diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 7d5075ec3162..05e0cf2e7d97 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -38,19 +38,6 @@ #define VNS_OUT_PORTD(io_address, data) \ iowrite32((u32)(data), io_address) =20 -#define PCAvDelayByIO(u_delay_unit) \ -do { \ - unsigned char __maybe_unused data; \ - unsigned long ii; \ - \ - if (u_delay_unit <=3D 50) { \ - udelay(u_delay_unit); \ - } else { \ - for (ii =3D 0; ii < (u_delay_unit); ii++) \ - data =3D inb(0x61); \ - } \ -} while (0) - /*--------------------- Export Classes ----------------------------*/ =20 /*--------------------- Export Variables --------------------------*/ --=20 2.25.1