From nobody Tue Apr 14 12:25:05 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 18C96C19F2A for ; Sat, 30 Jul 2022 19:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235623AbiG3TU0 (ORCPT ); Sat, 30 Jul 2022 15:20:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234179AbiG3TUY (ORCPT ); Sat, 30 Jul 2022 15:20:24 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C6DB495 for ; Sat, 30 Jul 2022 12:20:22 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id uj29so599617ejc.0 for ; Sat, 30 Jul 2022 12:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=WLvWy4K8HcW3LAslZh7Wr86ITXJRS+ffnYQWYzLiedQ=; b=B5XKMTbs4j/0CtJ6lJcJQSrjp/VFFmFEiwFaK9Eox4+BF/aN0I3zWl0LV0lxiMLB7Y c6cR2WpfgnR+NjfxBIzFKaDwAu+PoOTS3+pGs4Mz2bxtiMgQca7hbEHYuqpvfI3VPcsq 7W9yzuY1oOw+yKdnYfHkhClYfGrvpT6Z4DHxi2ywdq9OsjDN5mnTwYNoufdCShJ5dkpL bU+bpH4Uik4SqMrwFlaCc2WXIG/qRDDrN9CYiHyo/gi8IzzsU9ZFsUzy1xbMRkN6SzM/ rdDhlBaN8gkvSeyTHuzt5cnsWuyHhEzj+Bs9Wwpa9TW24z0lD5I1t9sxPUjIN3IsjKB8 3lTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=WLvWy4K8HcW3LAslZh7Wr86ITXJRS+ffnYQWYzLiedQ=; b=pDU4AanplEMs4/bnKZvYB5YCAPjq2Wt2aJAyLljOYG6OW3dJG6zexk0PTU0lM5uldT gQw+tR2ZAm11LN04s73satcnKvRTfI1Jff8p4aM/AcUH/h73zkacf/Lu2JfGVUBBfsHv gFS6T4C8mjE5vESymODlSAytU3py2PRPHzWMYUooTd/KhoGZLpPgQvTiBXqC5VMObdDu uwUIUw+Zt6X1lOZGTNAouPBo4QImFSE8cKV/U+Pw2ASgbybBbObus0wKHoAv5Do2+y53 kEwqDwLxozEEZK25BpUUzqVk7IwHvCogF94EZqNoHoLcFRiicyizCj3U73o9BU5vx1Pi 0VVw== X-Gm-Message-State: AJIora+RJrSw0u6U1nnBNWXwXK4pEP7x6+CsCZATEyQbPFrvc1C9PmLw 4AS60m6td4sHBk/gTxk7zmFIjknuElQ= X-Google-Smtp-Source: AGRyM1sUvBVN9C33ftS/bi6aY2bbpN7dTz1bbU3T/IvMGkYU4Qqki8+lDRrjCraw0MglcO9B8hRFhA== X-Received: by 2002:a17:906:730c:b0:72b:4f83:51c1 with SMTP id di12-20020a170906730c00b0072b4f8351c1mr7115513ejc.515.1659208820999; Sat, 30 Jul 2022 12:20:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id yw17-20020a170907245100b00722fadc4279sm3218418ejb.124.2022.07.30.12.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:20:20 -0700 (PDT) Date: Sat, 30 Jul 2022 21:20:19 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] staging: vt6655: Convert macro MACvEnableProtectMD 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 macro to static function. Multiline macros are not liked by kernel community. Rename variable dwOrgValue to reg_value to avoid CamelCase which is not accepted by checkpatch.pl. Change variable declaration to u32 as this improves readability. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 9 +++++++++ drivers/staging/vt6655/mac.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 1fc8bdf8a311..3565aa53f007 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -216,6 +216,15 @@ static void vt6655_mac_dma_ctl(void __iomem *iobase, u= 8 reg_index) iowrite32(DMACTL_RUN, iobase + reg_index); } =20 +static void MACvEnableProtectMD(void __iomem *iobase) +{ + u32 reg_value; + + reg_value =3D ioread32(iobase + MAC_REG_ENCFG); + reg_value =3D reg_value | ENCFG_PROTECTMD; + iowrite32(reg_value, iobase + MAC_REG_ENCFG); +} + /* * Initialisation of MAC & BBP registers */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 467c599a3289..84d203c56b1f 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -543,14 +543,6 @@ #define MACvSelectPage1(iobase) \ iowrite8(1, iobase + MAC_REG_PAGE1SEL) =20 -#define MACvEnableProtectMD(iobase) \ -do { \ - unsigned long dwOrgValue; \ - dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ - dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ - iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ -} while (0) - #define MACvDisableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ --=20 2.37.1 From nobody Tue Apr 14 12:25:05 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 BDCC7C19F2A for ; Sat, 30 Jul 2022 19:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234179AbiG3TUl (ORCPT ); Sat, 30 Jul 2022 15:20:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235715AbiG3TUf (ORCPT ); Sat, 30 Jul 2022 15:20:35 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29CF110570 for ; Sat, 30 Jul 2022 12:20:34 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id ez10so13701087ejc.13 for ; Sat, 30 Jul 2022 12:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=HUoAZomuVEY3gWZs5PRO+GGlcpFSS2IlF4vVoPzeVgo=; b=HN2RwIDPEaVjNCV1XzPSUga1o1wtGNu7/UOLJgj5RnVjBNZl8cPif4Pxk1u6M9PH4/ Xu9ffrQZeQ+D/+BB4eGl9BYvWuSdr/ZUtsQvlGgNskCjhn71D/8auNidWLp6ciZ9kvXO e52PgPCQw58BC7ngd6FnNKLujO0vTQvBkvu9wrWR/8tCB6tf5yuHY5S9/brMiDb+u9hL cYE1OcJD8b93E9/4usiin2XhQSlusoK2Vd8f2dTyyc7bpSE10pwCIdjIixrniaQMixuU UPgxLc2UHLjoalNv8BrGs3UvhvXlEBftUFZm2nRNdorbB9luhtO7kf3PYyPsnjoHAm7M mI0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=HUoAZomuVEY3gWZs5PRO+GGlcpFSS2IlF4vVoPzeVgo=; b=Z4UOwvg3zgox289onb5bR6qGdzDdz07DRdfZBozc2a0r9ytzU509C6btt2L+szzxAs U64T/kiklLPkXuBi7M1eHj2RLCHL+n8AFUqvm470cVFnVMBVgP0Zgpj+1uJDUMZ0h0yW mct1zg6XxLJAX6+soSY3gDvEiqABS4GuX9uD5cHnCU35le/kKYKB7W4Tibv29wvTQlTh vfKeq0LM+yrTOpnh9Ue0ZT0gokiBEoDC9dL1soNG5llszFKXGie/3bGYra/wjoPo3jnG JlfDEQJwbhMFOmF/k2rk/65lzDtcIi9YoOkeIOWQBhxGtFw36cQawzfBYuONliplGdvk emMw== X-Gm-Message-State: AJIora8bfhFTuXosFnDKdEwawR112sDdqGGL5tjBL1Rie8sghQ10KRJO EHu0VfQdkJrb8mccVVgafFi7wRag2rU= X-Google-Smtp-Source: AGRyM1sJVck7k58kzPJmFKFcb8QhrXHG/kmie+BSgXBXqzStigwLX5UwwNgDAkLGbL4Ay+EMMYZu1A== X-Received: by 2002:a17:907:2cef:b0:72b:5b3e:3d7a with SMTP id hz15-20020a1709072cef00b0072b5b3e3d7amr6942572ejc.293.1659208832652; Sat, 30 Jul 2022 12:20:32 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id g10-20020a1709067c4a00b0072ab06bf296sm3282425ejp.23.2022.07.30.12.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:20:32 -0700 (PDT) Date: Sat, 30 Jul 2022 21:20:30 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] staging: vt6655: Create one function for four macros 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" Create function vt6655_mac_en_dis_bits_u32_reg with three parameters to cover functionality of four macros. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 12 ++++++++++-- drivers/staging/vt6655/mac.h | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 3565aa53f007..5f64204dc312 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -216,15 +216,23 @@ static void vt6655_mac_dma_ctl(void __iomem *iobase, = u8 reg_index) iowrite32(DMACTL_RUN, iobase + reg_index); } =20 -static void MACvEnableProtectMD(void __iomem *iobase) +static void vt6655_mac_en_dis_bits_u32_reg(void __iomem *iobase, bool en_n= ot_dis, u32 bit_mask) { u32 reg_value; =20 reg_value =3D ioread32(iobase + MAC_REG_ENCFG); - reg_value =3D reg_value | ENCFG_PROTECTMD; + if (en_not_dis) + reg_value =3D reg_value | bit_mask; + else + reg_value =3D reg_value & ~bit_mask; iowrite32(reg_value, iobase + MAC_REG_ENCFG); } =20 +static void MACvEnableProtectMD(void __iomem *iobase) +{ + vt6655_mac_en_dis_bits_u32_reg(iobase, ENABLE, ENCFG_PROTECTMD); +} + /* * Initialisation of MAC & BBP registers */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 84d203c56b1f..31e75df5f02f 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -21,6 +21,9 @@ #include "device.h" =20 /*--------------------- Export Definitions -------------------------*/ +#define ENABLE 1 +#define DISABLE 0 + /* Registers in the MAC */ #define MAC_MAX_CONTEXT_SIZE_PAGE0 256 #define MAC_MAX_CONTEXT_SIZE_PAGE1 128 --=20 2.37.1 From nobody Tue Apr 14 12:25:05 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 522CDC19F2A for ; Sat, 30 Jul 2022 19:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235801AbiG3TUw (ORCPT ); Sat, 30 Jul 2022 15:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235636AbiG3TUn (ORCPT ); Sat, 30 Jul 2022 15:20:43 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A05F6101DF for ; Sat, 30 Jul 2022 12:20:42 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id m8so9278967edd.9 for ; Sat, 30 Jul 2022 12:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=zEv3y3d4lNBhF3QA9eeB4K5jO3MyXebCpviRLBi5Fd8=; b=ETK2IwoiqFreK+LdBxvQp69R8sQXA7iT2jSauG/Go+LOLNvH2LrtrDW+QryRnXLqWu vGLLEjprU1sZ+4pWM+PT4/ycb0IZON13ja8QO7rr5TLo1ETPZ7FgUp1G3PT3msHAwBDh 8AiiJ0nQuxnlhezW8En0tMLR5Whjs5nic7imP41lURhGnYAh27/JWhRsAVXyaLItboOY MkhJofGZHNNiNM73eJYf7ylfBDzG+BdSq+YrCEgO3Hll2ErWRFW3xUjkCITfuiBFoWES G6FRQZbp2mvLLaa+60IiL54E3Bxu4SsZXX2wqPGh5UkyDulYpnxOnO202ZripDjsVLUz 1IaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=zEv3y3d4lNBhF3QA9eeB4K5jO3MyXebCpviRLBi5Fd8=; b=Ko2KJvHiyQ9FavGclZeQsi1Vn4+rrdH2hvC3FgzoeF1zEt9u+IWDV9aWlK8d4J67hY p94fC4GQKEeu+9Msnp8KQk69fCl8byarVZu5xcaOxz8Lo0IQyyCAU+m8PDW3JHPKR0b/ ipa9vDZJf+TWRfiNZFZa4rmuPUWxKZ7o8DNDXlwqSuD0/18a/TlFGltmKGn8g1cCl0rR IvbB2NA5qXMdb+lS9nk8xhsRCKSYQXCwZZafBB6aasdPKy4ukM3/QMLouw1loH5YNdUh sJpqWaVIh+Z1APjbXPna+9ehiQqk35kPpgztOBUnnsWoi/fHDdOkdh2IOinWwt1NbbGS IlbA== X-Gm-Message-State: ACgBeo0DQKD+87psPuppnR7iUYq9+3qG0+ycDV9+KWuivfzN2HuLfbj8 f+kVUuL7pKZuCgJVma9cTyg= X-Google-Smtp-Source: AA6agR4JYUmtMB6i+qWDdcsOlKx+QbqKkxm1aWgSfzDHDl9XxBVV8Q6wZcvxCw/FMcTKb1ziFfB3+w== X-Received: by 2002:a50:bace:0:b0:43d:370a:e1c1 with SMTP id x72-20020a50bace000000b0043d370ae1c1mr5947702ede.193.1659208841143; Sat, 30 Jul 2022 12:20:41 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id p27-20020a056402501b00b0043bdd401cafsm4214506eda.47.2022.07.30.12.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:20:40 -0700 (PDT) Date: Sat, 30 Jul 2022 21:20:39 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] staging: vt6655: Rename function MACvEnableProtectMD Message-ID: <3e5edc9a6a0cefa5474d125321a8b6d6caf58e19.1659192760.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 MACvEnableProtectMD function to vt6655_mac_en_protect_md to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 4 ++-- drivers/staging/vt6655/mac.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 5f64204dc312..7633602e47c1 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -228,7 +228,7 @@ static void vt6655_mac_en_dis_bits_u32_reg(void __iomem= *iobase, bool en_not_dis iowrite32(reg_value, iobase + MAC_REG_ENCFG); } =20 -static void MACvEnableProtectMD(void __iomem *iobase) +static void vt6655_mac_en_protect_md(void __iomem *iobase) { vt6655_mac_en_dis_bits_u32_reg(iobase, ENABLE, ENCFG_PROTECTMD); } @@ -1478,7 +1478,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw = *hw, =20 if (changed & BSS_CHANGED_ERP_CTS_PROT) { if (conf->use_cts_prot) - MACvEnableProtectMD(priv->port_offset); + vt6655_mac_en_protect_md(priv->port_offset); else MACvDisableProtectMD(priv->port_offset); } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 31e75df5f02f..66e03e8173ea 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -12,7 +12,7 @@ * Revision History: * 07-01-2003 Bryan YC Fan: Re-write codes to support VT3253 spec. * 08-25-2003 Kyle Hsu: Porting MAC functions from sim53. - * 09-03-2003 Bryan YC Fan: Add MACvDisableProtectMD & MACvEnablePro= tectMD + * 09-03-2003 Bryan YC Fan: Add MACvDisableProtectMD & vt6655_mac_en= _protect_md */ =20 #ifndef __MAC_H__ --=20 2.37.1 From nobody Tue Apr 14 12:25:05 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 5217DC19F2A for ; Sat, 30 Jul 2022 19:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235675AbiG3TVA (ORCPT ); Sat, 30 Jul 2022 15:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235648AbiG3TUx (ORCPT ); Sat, 30 Jul 2022 15:20:53 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E82B81707B for ; Sat, 30 Jul 2022 12:20:51 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id ez10so13701872ejc.13 for ; Sat, 30 Jul 2022 12:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=ScMzAp/iFdVUbCt1AUeqrEtgtq+mwTLWTpajmOZrSE8=; b=kw7apWRHd1qsweoWZOf4sEKh6YKInX3oUpMyjAwBaHeKrM1Hca5jZF+PLxj3xXb74n x5jTx6InS2xFdO3ySVIrIo0wLSP6/Pd0Ci/Yvs410KbNhqhigJR8uhsjAY3M5F5ihvEc bTiTO4e4KKHVQP4cxFX6h8o58skcYYaIFkF9ylKEOhiwSxoc1A+ax5tbFkY2lCYc7yM6 H0cmXu8LUpnDo/E5ZgsALa8pxsY9DT5NlISsxRHe/gk/ol1rdp4ILAa++IjgnYQPqnyJ XQ7tKBB+5l92Iiu2OznIw8CgJZ1hFuvtNL4HXmfvP8/VLjwtBc53vknJuePxPC9DOMZZ TvZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=ScMzAp/iFdVUbCt1AUeqrEtgtq+mwTLWTpajmOZrSE8=; b=pyh+0QSM+HeDkGOXh75pw9ZAbvH70gQy/xzzrd4dsVia2bNL0WNgVN7+24bLGqhtSn 1A0xKH5qMZSzCs0Xo546vk20hsPZedtnQSwpSp0X8dhhDB3rwavfTNYZgTRAHCcW4y5u 6oduk0oZP059s9aH4XRF/CwINcWmCzf13GYfPG0cjZHFJYcVgRTBuWeGuq2UGkktTAiV 9yWBeyj1dY/Sxstvs62QasZlxu11fbQ1HlyDew2DIsqCtJvgluKPOBw8L5l7tXdkSntQ E8ZXERUe7ngqNy2FXuln7lGBoS5AnCqH9aNdSBHlZFYpc1QLCTOTNOgV4FAmIwOX0baH UB0Q== X-Gm-Message-State: ACgBeo0LRnF1EHm6WDoxw0yk9OwxS7vNtKDBGi6bLBPuAQuOzgrRoyyd LUDx2i3+RYAG1zfg1ytsnXI= X-Google-Smtp-Source: AA6agR6kzaM60NLPi6oOwYzcSDu+S7cv78/ZeLtg9RrjAAgYKfZK7PZRkNMt5HbUWF4ZhJtGzDuIpw== X-Received: by 2002:a17:907:2c74:b0:730:61c8:d80a with SMTP id ib20-20020a1709072c7400b0073061c8d80amr1026445ejc.702.1659208851375; Sat, 30 Jul 2022 12:20:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id u1-20020a170906408100b0072fa1571c99sm3262462ejj.137.2022.07.30.12.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:20:51 -0700 (PDT) Date: Sat, 30 Jul 2022 21:20:49 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] staging: vt6655: Convert macro MACvDisableProtectMD 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 macro MACvDisableProtectMD to static function which calls the common static function vt6655_mac_en_dis_bits_u32_reg. This saves codelines and multiline macros are not liked by kernel community. Function name is also changed to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 7 ++++++- drivers/staging/vt6655/mac.h | 10 +--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 7633602e47c1..c09d80effc3f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -233,6 +233,11 @@ static void vt6655_mac_en_protect_md(void __iomem *iob= ase) vt6655_mac_en_dis_bits_u32_reg(iobase, ENABLE, ENCFG_PROTECTMD); } =20 +static void vt6655_mac_dis_protect_md(void __iomem *iobase) +{ + vt6655_mac_en_dis_bits_u32_reg(iobase, DISABLE, ENCFG_PROTECTMD); +} + /* * Initialisation of MAC & BBP registers */ @@ -1480,7 +1485,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw = *hw, if (conf->use_cts_prot) vt6655_mac_en_protect_md(priv->port_offset); else - MACvDisableProtectMD(priv->port_offset); + vt6655_mac_dis_protect_md(priv->port_offset); } =20 if (changed & BSS_CHANGED_ERP_SLOT) { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 66e03e8173ea..3a9721624cff 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -12,7 +12,7 @@ * Revision History: * 07-01-2003 Bryan YC Fan: Re-write codes to support VT3253 spec. * 08-25-2003 Kyle Hsu: Porting MAC functions from sim53. - * 09-03-2003 Bryan YC Fan: Add MACvDisableProtectMD & vt6655_mac_en= _protect_md + * 09-03-2003 Bryan YC Fan: Add vt6655_mac_dis_protect_md & vt6655_m= ac_en_protect_md */ =20 #ifndef __MAC_H__ @@ -546,14 +546,6 @@ #define MACvSelectPage1(iobase) \ iowrite8(1, iobase + MAC_REG_PAGE1SEL) =20 -#define MACvDisableProtectMD(iobase) \ -do { \ - unsigned long dwOrgValue; \ - dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ - dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ - iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ -} while (0) - #define MACvEnableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ --=20 2.37.1 From nobody Tue Apr 14 12:25:05 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 C043BC19F2A for ; Sat, 30 Jul 2022 19:21:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235689AbiG3TVL (ORCPT ); Sat, 30 Jul 2022 15:21:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235715AbiG3TVE (ORCPT ); Sat, 30 Jul 2022 15:21:04 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CB7411C25 for ; Sat, 30 Jul 2022 12:21:00 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id z22so9310699edd.6 for ; Sat, 30 Jul 2022 12:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=4v6G96QLARZg9Gc1XZ9O/US7Fz7qZojxFxMbsbdJjOE=; b=oT1Kb8Qq6N4PoqN+E5kGFBAEBb3rtv0Q0UeRxVyO5fOGzHEY7J7nstvQxuCLUCNm/j WoxndF1Hgcrb5IwLf5CL8rKvtm2f95kdzRLLXl4VMf4zJ1pcHzv9d+24PEEfvkxe+Ekz Tyx867xQ5ODWXvpi8JNSJjYvqZhxlcMR4wu57M4eXjIHvCssNE+Q/B3KbOgVvT5xPB22 dSH5URXLFFsMaJ2ieu3nudxvFR+jbx7ozzC6ci2MzwjsXqxl20fcusvKSXVCtkon5HNi FfQKukDG+RZcTYmNj+NbfkgKtJtDpIHnm+UmUPDv6WwRm3OQiCgY8U9kAc7plgNnh9vd cYtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=4v6G96QLARZg9Gc1XZ9O/US7Fz7qZojxFxMbsbdJjOE=; b=Yddoj3CAW+5IiP32sewTocpEjbV0x81sFF+enzVousUk3Gcrz9xfO4vVfwFhlOw8Ku kE4+Iee+NE6dOlEg7JxVGyYfIRcr9ccekPiSzAGDwvGOOZwobNO+zl1PxRDzmYb+oJTE aEZh7mXo5ZfqoTvD0RKRCVqrsqczxo1uuGlBSt8YCyvm4xsdggDEHOb9nHbBasZOCD1u nsOG1dVJvk3TL7kE3/LjvPtBCTdjdGgBnFww0zEAJis5QxKagKUHlu/vfbG9cNpsRKYJ yimuVLt8WQy7qR3MYZyBX6tswD6hcZV9DLXs2KgX3mkHaSgqhXP0brsaTTaTp+DLJbWB a3BQ== X-Gm-Message-State: AJIora8WZWpuxnW8kMSQonreUJGXj0CwOAIdTVXcBphkTtqyHTCJmCMd gcHOb9XmeymB+mDgnjgQg64cLsm3SvM= X-Google-Smtp-Source: AGRyM1ueTOKOuajFpMX31cpAHT/xoy+XzF/4fXzVbSz/fiMWxuzc5vlDSK3B+7ic188peIADaxrkxQ== X-Received: by 2002:a05:6402:2d1:b0:43c:bb20:71bf with SMTP id b17-20020a05640202d100b0043cbb2071bfmr8807498edx.59.1659208859109; Sat, 30 Jul 2022 12:20:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id l4-20020a170906078400b00730453877b1sm1254537ejc.217.2022.07.30.12.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:20:58 -0700 (PDT) Date: Sat, 30 Jul 2022 21:20:57 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] staging: vt6655: Convert macro MACvEnableBarkerPreambleMd 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 macro MACvEnableBarkerPreambleMd to static function which calls the common static function vt6655_mac_en_dis_bits_u32_reg. This saves codelines and multiline macros are not liked by kernel community. Function name is also changed to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 7 ++++++- drivers/staging/vt6655/mac.h | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index c09d80effc3f..5ca8a302011d 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -238,6 +238,11 @@ static void vt6655_mac_dis_protect_md(void __iomem *io= base) vt6655_mac_en_dis_bits_u32_reg(iobase, DISABLE, ENCFG_PROTECTMD); } =20 +static void vt6655_mac_en_barker_preamble_md(void __iomem *iobase) +{ + vt6655_mac_en_dis_bits_u32_reg(iobase, ENABLE, ENCFG_BARKERPREAM); +} + /* * Initialisation of MAC & BBP registers */ @@ -1473,7 +1478,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw = *hw, =20 if (changed & BSS_CHANGED_ERP_PREAMBLE) { if (conf->use_short_preamble) { - MACvEnableBarkerPreambleMd(priv->port_offset); + vt6655_mac_en_barker_preamble_md(priv->port_offset); priv->preamble_type =3D true; } else { MACvDisableBarkerPreambleMd(priv->port_offset); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3a9721624cff..fd95f49aa739 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -546,14 +546,6 @@ #define MACvSelectPage1(iobase) \ iowrite8(1, iobase + MAC_REG_PAGE1SEL) =20 -#define MACvEnableBarkerPreambleMd(iobase) \ -do { \ - unsigned long dwOrgValue; \ - dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ - dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ - iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ -} while (0) - #define MACvDisableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ --=20 2.37.1 From nobody Tue Apr 14 12:25:05 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 C5536C19F2A for ; Sat, 30 Jul 2022 19:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235750AbiG3TVU (ORCPT ); Sat, 30 Jul 2022 15:21:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235747AbiG3TVM (ORCPT ); Sat, 30 Jul 2022 15:21:12 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76BF811A2D for ; Sat, 30 Jul 2022 12:21:11 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id os14so13760953ejb.4 for ; Sat, 30 Jul 2022 12:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=uoHNcIjYvVZqJisWxXcOOSOxiOgF7GrC4J54f5gJBt0=; b=Qmk/bNckYvraHA1It20FdjHfRhkySURaZkEScXU9hi5lyg16rH4MHOQA70PN3MitxV yEgulGP06o+nEpBuKpw34g7j70Lb6yk48HbgPNSSS+SWQhQ3k1vSal3WI8DrDZz6WRir ++6XzMh+sxzmEWr4Aa2j4922Nak20vr0iiKF5mmexArgByS7pPQEnBAD0nPNpO3Rbi/0 NdJJ5YNEkfGb0icfpX0BNyOw/6CmlpELcGRJOor8EnJZndA+5OtUb7eMqvQEhEVdxM4w +OrcAJ184YfCW1PTR72eptaCuu5tyrmECWLXdKMwfTW0KAJoOHM7l8LBK07x0HjQvI8U XJdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=uoHNcIjYvVZqJisWxXcOOSOxiOgF7GrC4J54f5gJBt0=; b=69UBSmglZp/fQX06JwlJWO/vfSU23j10TIavyTcwjWWd46N0jhMK895XWo34O+E04H XJquyceT4JqYbE6DvUIRm1PHWUiloQFZJcpvsQH62PvfEB6ybWKcHeOooP8q5rXXZMny n1jvK3cuL5+gKFYDm4qXWw2UF5w7RRCkdV3XgvVQaMl2Ef3qn74II5/EohadtmP7O19U l36h6I6wG57+YhsEQFO4v4jx/zPXZYjJ1jdKtKgg5sCC46EaM1rhT1p9LbrrQ+MLtzGh QTrILyQ324pSfsz9cQEjNZLV0S4e2+kUydebrrnmhoIizNAHveSxJcCqgcEkm8gBIsTc dkIg== X-Gm-Message-State: AJIora96VZqemYKRRkAq0aryoDSpRMQfsXPBHKzQF4LXMEFwkD3sFyoz NIHkTb5QWIvRraNjchsdSr8= X-Google-Smtp-Source: AGRyM1ucG/gRuy6TcFDN4BHzu6BNmw9kD+voS1BGi4wDDQ/N0XbOhwY6/x9N8exRPo0+7o3AJ6AjPg== X-Received: by 2002:a17:907:2d08:b0:72f:1dff:edf5 with SMTP id gs8-20020a1709072d0800b0072f1dffedf5mr6999117ejc.391.1659208869899; Sat, 30 Jul 2022 12:21:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id i13-20020a056402054d00b0043ca6fb7e7dsm4158626edx.68.2022.07.30.12.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 12:21:09 -0700 (PDT) Date: Sat, 30 Jul 2022 21:21:07 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] staging: vt6655: Convert macro MACvDisableBarkerPreambleMd 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 macro MACvDisableBarkerPreambleMd to static function which calls the common static function vt6655_mac_en_dis_bits_u32_reg. This saves codelines and multiline macros are not liked by kernel community. Function name is also changed to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 7 ++++++- drivers/staging/vt6655/mac.h | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 5ca8a302011d..6efa79e8a651 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -243,6 +243,11 @@ static void vt6655_mac_en_barker_preamble_md(void __io= mem *iobase) vt6655_mac_en_dis_bits_u32_reg(iobase, ENABLE, ENCFG_BARKERPREAM); } =20 +static void vt6655_mac_dis_barker_preamble_md(void __iomem *iobase) +{ + vt6655_mac_en_dis_bits_u32_reg(iobase, DISABLE, ENCFG_BARKERPREAM); +} + /* * Initialisation of MAC & BBP registers */ @@ -1481,7 +1486,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw = *hw, vt6655_mac_en_barker_preamble_md(priv->port_offset); priv->preamble_type =3D true; } else { - MACvDisableBarkerPreambleMd(priv->port_offset); + vt6655_mac_dis_barker_preamble_md(priv->port_offset); priv->preamble_type =3D false; } } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index fd95f49aa739..012388bf8d3b 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -546,14 +546,6 @@ #define MACvSelectPage1(iobase) \ iowrite8(1, iobase + MAC_REG_PAGE1SEL) =20 -#define MACvDisableBarkerPreambleMd(iobase) \ -do { \ - unsigned long dwOrgValue; \ - dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ - dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ - iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ -} while (0) - #define MACvSetBBType(iobase, byTyp) \ do { \ unsigned long dwOrgValue; \ --=20 2.37.1