From nobody Fri Jun 19 10:45:51 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 064BEC352A8 for ; Mon, 4 Apr 2022 21:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378989AbiDDVSc (ORCPT ); Mon, 4 Apr 2022 17:18:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380659AbiDDUug (ORCPT ); Mon, 4 Apr 2022 16:50:36 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2ED0BE3D for ; Mon, 4 Apr 2022 13:48:38 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id ot30so12552402ejb.12 for ; Mon, 04 Apr 2022 13:48: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=/DCTfmFnsCW6CmRyecYd9kX39hqliOdp491MdVfso5g=; b=bWxC1Y22FmwVfdcBonget0iVkMXSjt/KdvaDX92OdaYjAW3YBevMMC8HvrTUY6JiVH eP8BhbWw90akIHKJmstXdVwaYAbrKgV1pF8BaPpl8GORABUvb5KKtl9PbX/yHYxEka0f nh/VQkQuCZ6fZHjsJC3SwaR5vPVyF/351XDN3u5610vKrsm9hMGsfmoZNtaA3beo3NX+ Q0zzy6kofRl4HkkIuSTygTxcXD4Y1ykItLYOjnq1Ih9Tf2dgVhqv/vhqLwbq6XvOwcCH oDdVVlFFtCzcTafYcuTvPrYOBlFoUaED3V4CdTwME1+a8g5WRdWwn4djpKilCkLsXFdU 0qNg== 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=/DCTfmFnsCW6CmRyecYd9kX39hqliOdp491MdVfso5g=; b=qfzJADIQpfSQ3QQhmx3bvhw6l3kwAXN/q1jNw0d9SHj/H+KwXS8+opSbXp+fSaLmri wO8lSGKVmZ5+4eUTSuLPHZ0dhozvnO93StzywQd5HUqVBpnv0F8qUXBWVjAKgaYhuqpg iyl/5SSMlcGBhyoNSA/Rl8KI2i5/QofSaRNwGfP6wFjZgWGBsPqwahgkK6Vu8f6/kW6R iteKD3yRCpxerqBKnvDl0DLddsitJGJCOCRkRv/kp+Gf3ev/nu6Fn3OSxU2RriNjHnVg 2RF8k38I3DATAG6D/xQa8Fiah8OaBKSitZ0cP/zLqtrNLEEw1pZHo0sjN15Z7X5WzcC/ 6kwQ== X-Gm-Message-State: AOAM531iTSI9Prh8+PhjRgPvoopTFVeP4Z+0ETO7hwytmBS1H+tyxbCC 96BapnVwjWojEP/rczKzSfI= X-Google-Smtp-Source: ABdhPJwJ6dim7l0HBfsKEpnDkESDuj1aS+iYOTW5QpQumXtQTW6yj3XhjhEPxbhpkEZ2GBfgqVZVJg== X-Received: by 2002:a17:906:c103:b0:6e0:df50:7f52 with SMTP id do3-20020a170906c10300b006e0df507f52mr8027ejc.501.1649105317561; Mon, 04 Apr 2022 13:48:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id h7-20020a1709066d8700b006d4b4d137fbsm4821903ejt.50.2022.04.04.13.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:48:37 -0700 (PDT) Date: Mon, 4 Apr 2022 22:48:35 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] staging: vt6655: Remove unused macros in mac.h Message-ID: <78f72d0aa3d1bdddf3c415fd4c458399aa5e7cbf.1649103348.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 or CamelCase in mac.h as they are not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- V1 -> V2: Merged two patches 1/7 and 2/7 into one. --- drivers/staging/vt6655/mac.h | 133 ----------------------------------- 1 file changed, 133 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 550dc4da80a9..a1576e006d69 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,37 +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) - -#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, \ @@ -622,24 +576,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,27 +612,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) - #define MACvStart(iobase) \ VNSvOutPortB(iobase + MAC_REG_HOSTCR, \ (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) @@ -704,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; \ @@ -736,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; \ @@ -759,26 +662,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 @@ -811,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; \ @@ -855,19 +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 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 10:45:51 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 3B08BC4321E for ; Mon, 4 Apr 2022 22:08:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380287AbiDDWHJ (ORCPT ); Mon, 4 Apr 2022 18:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380660AbiDDUuo (ORCPT ); Mon, 4 Apr 2022 16:50:44 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9454ABE3D for ; Mon, 4 Apr 2022 13:48:46 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id c42so5143723edf.3 for ; Mon, 04 Apr 2022 13:48:46 -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=xP9jxTSak01lxmiakKDzw6tCWTqu+z8FWoXYBzz+at4=; b=omy2AIuqVywXHaB1TgVBQfaL9aXT1m5LbFuwW9cXRgAPQqqhmvl76Inrg9qaryawnM esujdaeCCX8Sc53UgzDu89sgMls/ZD1WNjF+YjzI/gaIvUjnxX7KZnYoZDK0M0lUl+Mv YjjT2wenD9tsKUjynE0FVjcvyzXWeqGwQb9jNs0Rgu4OMMjiSWFQpcimHPG3rNwIvCCH QHIvEe4EEWAhJaC5xKejr/7hr3d/Ccd9Qoi782kpfWQnCDZVE6oG7oR1J2LAHHOfQXBn M2f58A16NVleW2/g0wz+Hkf1J7USZghZBUnj4i4trrMP5460NIfHF+SoI/m1i6+yM0s2 hwng== 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=xP9jxTSak01lxmiakKDzw6tCWTqu+z8FWoXYBzz+at4=; b=5cRaWHVQkxKQW6U1RkakoF4kpDIPE9uGjBkCV5Wm17LxEX9VS4GT/KFFOZL/WS0A0F hzFHdsHw183Ihhsha2iQX/BTmBVIPw8C3m9N19CBE0Fe0rdhh7y5gPXwgN36yeHAF7VB 1oSkEcpVnf8dYUh7823rdnF2coUdw0r7Il5xDyqJLGgMYQ68USE1uECjsEQNGEeG7EXV 3xdtS4oPe9eL72Sm02IO86da3fUx7tDIlGvQoLwDR2gxhQEvgV9esRw8ziwy5hT6rj9E TctEhAwh4qo2mZsjJaN25+cqjbfVqUmQhXESYdyE8f16yMBCnYW5dOEoJkNcnIme+TPY pcBA== X-Gm-Message-State: AOAM533Yk8qHRspgDNzRhyNlf99LmUCsOWGCDm4ynmCNStgv78OuknU2 ax5euf3EFmKQur5ByP12pRs= X-Google-Smtp-Source: ABdhPJylTVfzbgmKB6QFg2/UzA2mS8DmKOyUftLfYwf62WUoAAVvOesuayHErRHSY6zVeeaPkb5P7A== X-Received: by 2002:a05:6402:43cc:b0:419:2486:6cd2 with SMTP id p12-20020a05640243cc00b0041924866cd2mr4973edc.334.1649105325066; Mon, 04 Apr 2022 13:48:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id n27-20020a1709062bdb00b006da975173bfsm4843522ejg.170.2022.04.04.13.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:48:44 -0700 (PDT) Date: Mon, 4 Apr 2022 22:48:42 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] staging: vt6655: Rename constant definitions with CamelCase Message-ID: <19cfb3ec78eaba8e839578b1ea5a6eb09e8c09be.1649103348.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 --- V1 -> V2: This patch was 3/7 and is now 2/6 --- 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 10:45:51 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 17092C433F5 for ; Mon, 4 Apr 2022 21:18:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379603AbiDDVUE (ORCPT ); Mon, 4 Apr 2022 17:20:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380661AbiDDUus (ORCPT ); Mon, 4 Apr 2022 16:50:48 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B824BE3D for ; Mon, 4 Apr 2022 13:48:51 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id bq8so22459212ejb.10 for ; Mon, 04 Apr 2022 13:48:51 -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=J4LkMGmqh/IpZ1iCRfWTzUc90cCZBJCLLtl1EUpG/xY=; b=ZQN200a6cw/b5AfpR3Dx+RPgXMa7VenkpOgBGHkNCRIdT7BMrcE0L9W5n6V1sqV/GN VEjoVu8+TawE4B49MAioeNQyQLC/a897Fb1sB9R1KZuQUS3OlvyDSbc5eAKznWJj8PK7 jSNFpYCDeMwCo9Qds7kiuAe30vY6FftnulC1FY/DcibM1/4NwlaCB99KMPb9vY3Uq9EY 9sFAOKc5yrHx0I/XzPoj6ymiCprXHlzBc/gIgtxhURExOL4+jiBD8up6omNaJlQzZSJ9 LFQH5DJZkK9mKsQlf094jh1SEs39EQjlHqoakvAbhg9dykYq9DUfruVI3jSlCGiezjIw qw7A== 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=J4LkMGmqh/IpZ1iCRfWTzUc90cCZBJCLLtl1EUpG/xY=; b=ow1yFeRpF6fhpmXqG+AAtrq/oKrSxeQfZg8kerB5JHS/xffQUXJKCZd/c/QMqOjZSp RTa+x79yk3GHu5mt2tO6eZEiDFQGJhFBhewwUaEbFRa+4GKS3a1T/cMajw+AhgjgAsqD CeejOD6x8zxoDLqGCAj1gb+mCIUvQ3TCYWtF7yXhuRypVKPR2onxyd6DmtKuHCuy56Xt gU6EN8REN1VH2Ifk5BKc+r4//qiRPHIdNqkMOQxQURDmUop9KKkMxpa61+D+7ChoCuWO lpE4opC4WL1f69PGi/m5qDpHMM5JNYf6vepNv8BTOhY6PkygO38MDJ5PpProMQTm4HTK V6RA== X-Gm-Message-State: AOAM530rpGo+WOrz6s+hFPUIWTrWMnqayCAZ4tPbWQOF1YrWpFnqL7Wr zifVwVtpE17wcdZmsB/hqZs= X-Google-Smtp-Source: ABdhPJyOceuk4zKyHG56ftwcYbV0B24dltyTGZZA6cCalDmcC0XzzoKQDp1oRM93oXIPqNXKlmUrlQ== X-Received: by 2002:a17:907:7ea6:b0:6db:ca53:9b0a with SMTP id qb38-20020a1709077ea600b006dbca539b0amr1857492ejc.763.1649105329789; Mon, 04 Apr 2022 13:48:49 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id x3-20020a50d9c3000000b0041c8ce4bcd7sm4529339edj.63.2022.04.04.13.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:48:49 -0700 (PDT) Date: Mon, 4 Apr 2022 22:48:47 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] staging: vt6655: Rename macro arguments with CamelCase Message-ID: <70cce6671976e454830c12d6d7977a5fe816a287.1649103348.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 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 --- V1 -> V2: This patch was 4/7 and is now 3/6 --- 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 10:45:51 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 9CCFCC433F5 for ; Mon, 4 Apr 2022 21:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382478AbiDDVvT (ORCPT ); Mon, 4 Apr 2022 17:51:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380662AbiDDUuy (ORCPT ); Mon, 4 Apr 2022 16:50:54 -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 3FD4FBE3D for ; Mon, 4 Apr 2022 13:48:57 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id ot30so12553684ejb.12 for ; Mon, 04 Apr 2022 13:48:57 -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=0d3RlzCZMgsq11e2hqshe8ZFXAtKOmd50MfeSnFBOt0=; b=GrfLTfHDWjCXz/bZ7440a15s2kpCTBA78mPwrjeoapSOy4B0jB6wGSqvphssq7Fh2/ DOfqrTKq8rMEHHMONYetbPCdT31ltNlTzA8n/OcHLVLPHS+PS/JIaaudJ5daiZ5GrVst MWCDLmvf0a6dPeEYY0T4WSFqtM4NFgE9SWfBkbP5CQJnUrUEh9PhTUcuWyb+HTt1sft8 NXkZiLF5lV/UlNWlnfjKqt92RIsZutksb9pz1ZZ7TH8lnMyEWU68CopqrEzhFXj9/DIG +eBPmwWorkn4evw3oUT0DfqCt6ojw0myZnj4Zm5o3vPvIxNpBH3Qhflkll0hXzgssbPL nD+Q== 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=0d3RlzCZMgsq11e2hqshe8ZFXAtKOmd50MfeSnFBOt0=; b=Jpvc0fCb6nkPeSLqwQVH+CRZ++W9sNSyW6wZfO/az8LQXm+4cK9NRB9Lxq6TQzIKN+ h81SrVnz4HPaXqjJt8shL2s7yafZtJpILveJWZDy1wipPwkp/S3w1bwfwuMQokwQSh8Y uDV9XsL9UvsBYmxYWzRGN/km5EvLKvheV2Nn2T/xnsGiQF7tpA+mIsXc/I10K2vI3+HK 154lgW87066yNKY6LH0nAvAh1Z3maVMo4qrNpQO8caNMr6Io21yaFq/IPYi5gvQzYyc8 qyKJFEqzI4liL4QCVoNcw3Kin3TApplZKPS/iFM9n5VFUEVV+xkWJ/F9XBudohhdOSeR ItJg== X-Gm-Message-State: AOAM530L8j522y7F+TBxptIXu+08xDKeSCDz7g8cZOTddDVwQlbzeQxi YiAqZEQ6e0SjmlTBKm1Dpns= X-Google-Smtp-Source: ABdhPJyCQa2Ur4vTdDd8jkqAK9DjN3Ey3wycHl/sN/D7hxmeFhBQ1NINr3soTxW3FM7NSECxjdHb2g== X-Received: by 2002:a17:906:3104:b0:6ce:6b85:ecc9 with SMTP id 4-20020a170906310400b006ce6b85ecc9mr15988ejx.339.1649105335788; Mon, 04 Apr 2022 13:48:55 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id m20-20020a170906235400b006e718d8b849sm2908544eja.45.2022.04.04.13.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:48:55 -0700 (PDT) Date: Mon, 4 Apr 2022 22:48:53 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] staging: vt6655: Rename macros VNSvInPortB,W,D 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 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 --- V1 -> V2: This patch was 5/7 and is now 4/6 --- 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 10:45:51 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 E9882C4167D for ; Mon, 4 Apr 2022 21:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358116AbiDDV3F (ORCPT ); Mon, 4 Apr 2022 17:29:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380663AbiDDUvA (ORCPT ); Mon, 4 Apr 2022 16:51:00 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 900E6BE3D for ; Mon, 4 Apr 2022 13:49:02 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id i27so15393018ejd.9 for ; Mon, 04 Apr 2022 13:49:02 -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=UedJY96MzbMnrNvEjnC8IohUwk7LcWRbIZ3dDusTNco=; b=VmHOAX6dt0PTLW6hHV0NfZtsUuwTR2GS7v6eRBoM8oMduDJ9sUYUgNg6gImt53xUMe p+3b7hAgGvdzovtY3f3xtQLOBfcoiebSiIQTIJlcD5Ig52cqCqcJc1hCNqfT/njFbiWB 19F5a/QlLmwWaQh/LwEM6dkj+kP6k91Jbwv5+6GwhsJEzALpRiX4BraxkJXdSm5OJJUN 5DX5EKCaUeyYVAi9jHX3HRMYUJOAX9PS5jrPB/EvaSodyc+PKb1ObrSWg3stSc25kxnj T/ba976HdFoZPaiSmwW/rvbrhoC6FVINCaSoeWEDKGYv4WF4lOsb2CGnW2H7gQUYxhUa z6xg== 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=UedJY96MzbMnrNvEjnC8IohUwk7LcWRbIZ3dDusTNco=; b=KKOmH0VvTZublXbxTlsJcGVPJgoyKfIpUX+VTUVAMRyN9eJYtbzwkC2d9Tj/TCw2YZ 9AB6biTW9zU6nqmyLIh7UXZaRGqs8sTL/oSSBlt3rndtQWs5GNbFXQEe07/o+fEzCwjS f+wMv3dSqteudR1zAyc7L1aMuUjD8LP7y96lXhgTJ89UVMwlcPl6Uxde3q7Uxh1o3AHG +V2fPn5mCl9VdbFeDgUP6z1h/I+AWsl3eFJoKgMp0N9fEMOWQ+z5JrUfjelm6C1shGd1 ly/Q2V188e5OXlreBUCm8wMDstUnufdomQF7Mvcj6fN1/je9YpqDaEzbcFVWNFSgh5QH 4Njg== X-Gm-Message-State: AOAM5332RvIeoUEWKfWNUS/X9O+U1a32H9EGTYpq4hwm5+IV3ST/gwYh UjYxtTasdgVQnTcUgDN3moI= X-Google-Smtp-Source: ABdhPJwzegWkHeVKX+19SBkQxijHHBMT7MzLdNhfoWCCeUCwxgpNgmYj5kJHav1KyYc7rUyQn1rSMg== X-Received: by 2002:a17:907:72c5:b0:6d6:e749:da41 with SMTP id du5-20020a17090772c500b006d6e749da41mr4384ejc.591.1649105340982; Mon, 04 Apr 2022 13:49:00 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id r19-20020a17090638d300b006d6e4fc047bsm4870971ejd.11.2022.04.04.13.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:49:00 -0700 (PDT) Date: Mon, 4 Apr 2022 22:48:58 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] staging: vt6655: Rename macros VNSvOutPortB,W,D Message-ID: <95efbd1e48fa027ce7cf8dc7ad53e6cba0c6a1db.1649103348.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 --- V1 -> V2: This patch was 6/7 and is now 5/6 --- 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 10:45:51 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 6FBA9C4167B for ; Mon, 4 Apr 2022 22:08:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381988AbiDDWJF (ORCPT ); Mon, 4 Apr 2022 18:09:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380664AbiDDUvI (ORCPT ); Mon, 4 Apr 2022 16:51:08 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BDA6BE3D for ; Mon, 4 Apr 2022 13:49:11 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id d10so7782633edj.0 for ; Mon, 04 Apr 2022 13:49:11 -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=HHEmg+fr5p/zbKaGECq76obXrCQuZc+PpCxxd81H4xU=; b=Cz54hptYqES688DjAAbK5czO5dvQwJXWybrVQUz2Hjpdayu4G9M+aKsH7cxy9316PJ U5WPwk6AVeK1i6n+mfHJ3fgkI3nDdpE09BI+O7d0ohSkx5ulHnWgLYlfzYqfjcMWndct Qj95V8Zo9hVqxFJ67G54ZJb3yXKA+AEF1+3RkEDPoG6NXkNxORQgUkf45FAOOcMVjnbT sDxvb6XKnn+mzi1/lmklPLH/oUCf3qaXfeTzlDdq3UZ8IcGBMoX5LBX7CR+gOhoUZNEa R9QYqtUVG7z11/VyDetgl3jWUS44DonGWFnopeCzI7rRvluX24Axc783zpChiPtMwUse qUIQ== 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=HHEmg+fr5p/zbKaGECq76obXrCQuZc+PpCxxd81H4xU=; b=YreoIYSbBYPSVQ7aK9HFF+ayCBpejuKw107IAu3qcS3icO+DP8l+0AJjfya6ypSoIL hqwQHg+ZOCu9h3OcKxNzHcLi8T0Oad8JrH3Xf12WnYtt9zFqPlMfsuG3x6BKEja+tBG1 Wmormoxz+xdgmhvXzOtjOOsTluhIKmt+4zAx9McQR+BUzEsXvv82qsTVU9tS/707EedN c/TQq9VXm/ovZ2IZAH8DAkrYLQ0nGSbRSWZPRgVm6YRDXinMj+foUThdx9RnV4jJ+ApQ OjMP+oZ1BTXX59hnEqnLN2e0wPwTP8+FhwO1sRbP+pySLIb7IjmXY4smit8TELxVmG0Y 2bkw== X-Gm-Message-State: AOAM5310r/q5Xeb7TrRfXt6Q4JhCbIk5ma3YXAu0QXHGVGX2o2Jm+Joa Wev7zo3xPXKBz8zTlWkmNv4= X-Google-Smtp-Source: ABdhPJzb0rUG+QU53FfEw54N6apRT/DD8Nwd8qgh5DuPSeWrgOt5+lJkNPBtiQ8TL7lv8frvx1EFLg== X-Received: by 2002:a05:6402:4248:b0:419:4583:eaa2 with SMTP id g8-20020a056402424800b004194583eaa2mr3706edb.376.1649105349707; Mon, 04 Apr 2022 13:49:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id p14-20020a05640210ce00b00413211746d4sm5799012edu.51.2022.04.04.13.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 13:49:05 -0700 (PDT) Date: Mon, 4 Apr 2022 22:49:04 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] staging: vt6655: Remove macro PCAvDelayByIO 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" Remove do-while(0) and CamelCase macro PCAvDelayByIO as it is not accepted by checkpatch.pl As the macro is just used once with a constant <=3D 50 the functionality of the macro is implemented by using udelay() directly. Signed-off-by: Philipp Hortmann --- V1 -> V2: Changed converting macro to function to delete macro This patch was 7/7 and is now 6/6 --- drivers/staging/vt6655/srom.c | 2 +- drivers/staging/vt6655/upc.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 1612c9702e31..2719046f1ac0 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -80,7 +80,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, VNS_IN_PORTB(iobase + MAC_REG_I2MCSR, &byWait); if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; - PCAvDelayByIO(CB_DELAY_LOOP_WAIT); + udelay(CB_DELAY_LOOP_WAIT); } if ((wDelay < W_MAX_TIMEOUT) && (!(byWait & I2MCSR_NACK))) { 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