From nobody Sat Apr 18 09:30:54 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 D034CC00144 for ; Fri, 29 Jul 2022 08:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235610AbiG2IO3 (ORCPT ); Fri, 29 Jul 2022 04:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235558AbiG2IOX (ORCPT ); Fri, 29 Jul 2022 04:14:23 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F928210D for ; Fri, 29 Jul 2022 01:14:17 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id z22so4901499edd.6 for ; Fri, 29 Jul 2022 01:14:17 -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=aC62YFpOcEgWM0eoM1eba1ujgEXycmF9AE85pHvVPYo=; b=KsTgxSJ5gv51eJV6HUga21BewB811m0hye/yDxqPfcv+IsH9dsaAFdaFCn/3cLUkAQ pQa1QGAJn8i0QDTBw/kfIzKFM8l9lOWFgSsn+q0cCeFvfxi9f8X7Fvx6DwvG40GBZOYF noG+BiV92KwzXJGhqjd/d+7wFERUUSaL3PIj85vfPo9wXIm6AtyfIWiP8L1Il2OMKWBq vv3gi3rcXALPivyf0n7D3XVSeP30PmaD/NiJCwd3XQALvbQiTTwtOFnqenglq3lhISIP mz5w9Rys0+Q8kae/Wrc4lUMtTNau7JXzCXFVooxvR4eenDhlpXgeL3O0zAvW9jOJuRSc jPvA== 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=aC62YFpOcEgWM0eoM1eba1ujgEXycmF9AE85pHvVPYo=; b=Fa28qyTOLBR2dhn95pHz78qlpEnJ6OBJ9sZJJaxMsUWwQiUYrB0QJVHqia00YMUcGV PbMZRgf/zqzAWXrRPE2hldaUvAFeEgPFdmNoRiB5MLc1UzHKwoU4u0wLHcUDicdbRzzB sTlinC8XP3AdK3IVVqhzwxe/BwybzIS3oLpftDOsjcePz3Xj5Pu+j0R7ucaOZyx49hNP 3WsEvcijDUQsAbtpA05Xq7eXB7H3mh0amNSH2XCuMt/zQEzCK8yTOz24Jfm55pqSuGKs skzbmht0gfF9CsLcGF14i1OqoY9zS7/KFZvm+ePi0VQyh5QiMMXMNjSKjBdu5aXeBenh sovQ== X-Gm-Message-State: AJIora/RUPqO9iYEQga6gq7Xgt+p9DyeuLdWcEYZq8sE5JY35cwaH4O2 rdog+aG3IzS9fIZVNApcXKY= X-Google-Smtp-Source: AGRyM1uitipKu6Ae5L9nGXPf52ek+oE/jutXwoIVEw+HWNBWNxcMSs5gLjcTG6/skZ+sYiL+EdoslA== X-Received: by 2002:a05:6402:3511:b0:43b:c84c:e233 with SMTP id b17-20020a056402351100b0043bc84ce233mr2402327edd.211.1659082456016; Fri, 29 Jul 2022 01:14:16 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id 16-20020a170906311000b0072b13a10477sm1375609ejx.108.2022.07.29.01.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:15 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:14 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] staging: vt6655: Convert macro MACvReceive0 to function Message-ID: <059aca149bd0c1d75df4fb3cd8a177aa4948fb02.1659080988.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" Convert macro to static function. Multiline macros are not liked by kernel community. Rename variable dwData 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 --- V1 -> V2: Combind patch "Rename dwData to reg_value ..." with this one Changed order of renaming function and conversion to function Removed function declaration Changed variable declaration Improved patch description --- drivers/staging/vt6655/device_main.c | 11 +++++++++++ drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 92583ee8bffd..39bfbb1ab742 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -205,6 +205,17 @@ static void vt6655_mac_read_ether_addr(void __iomem *i= obase, u8 *mac_addr) iowrite8(0, iobase + MAC_REG_PAGE1SEL); } =20 +static void MACvReceive0(void __iomem *iobase) +{ + u32 reg_value; + + reg_value =3D ioread32(iobase + MAC_REG_RXDMACTL0); + if (reg_value & DMACTL_RUN) + iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); + else + iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); +} + /* * Initialisation of MAC & BBP registers */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 0122c4603c66..d21313f3067e 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define MACvReceive0(iobase) \ -do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_RXDMACTL0); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); \ -} while (0) - #define MACvReceive1(iobase) \ do { \ unsigned long dwData; \ --=20 2.37.1 From nobody Sat Apr 18 09:30:54 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 9A2B5C19F2A for ; Fri, 29 Jul 2022 08:14:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235536AbiG2IOk (ORCPT ); Fri, 29 Jul 2022 04:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235620AbiG2IOb (ORCPT ); Fri, 29 Jul 2022 04:14:31 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 826A581B25 for ; Fri, 29 Jul 2022 01:14:28 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id a89so4901767edf.5 for ; Fri, 29 Jul 2022 01:14:28 -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=tld5gMWJsp3kV9hB3O0WlH/vr+yYwLN7z32U+sL7wws=; b=XZSCO6k5T8iolGHuAQUnp4oI+0aciy6f+kG8Zlj09o3633lzPBTOhD4YFFkyb8RYW1 guG+YkmWGMe1BUUcN209Fwth3zqheiFTafLkAUmFDCCYarmcZprgn0axBw5+JfFB34qj RBEvMgwy6d9nhLRMRXYu0Dc+iJXZJdBnYwQMTAYbdVDO0Kfqz4Tfz7Y5dMuaJNkPQfGf U78hk3DKCecuCJ5taP9c2J/jhsFAxRW6Uf+8Jp0zxfVZ0mjEFcdBcIkBqo9nOoDpiXq3 JVFhtFGCS+iev5MjnJ8zD1tR2JcWzC2QDOzCLfeAlYWOC9C6FUo5s0pan8+9/Uq50qpP LaPA== 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=tld5gMWJsp3kV9hB3O0WlH/vr+yYwLN7z32U+sL7wws=; b=wf+0vpJu+kEVLfUkHKm3OkAdLeW+AYsBEB8zQhCVW2jtvlZVOmnfIfn8zKolhoO24C VfPQ2LrL2WWrvosHXEyy9flzLVteWC3o9K0u1x9NlkFIXMHpr033WSZNCy3s2lOrvb+b veGgTZLXBLOhfWWY+Jq0TSh98femknqIJMhXCS3WnN+Et8QQf3ADkEWtFaBYSmghB8yu QdzjRHvqH7Z+/aJfSHqcswW5vT0+E5TfkRh0EXt9Amzl/mVQ26KeK9j0dyISqrxhDmFW +e+QTGUHmYFkgxDgO77J400Gf8/EJaVhXwmgR6W0JKc3oHjeMDMn1+Dj7RRAqFnuF45I lGHA== X-Gm-Message-State: AJIora80ZY9KGRJ64GRfAM1vY7Mez1JdAbsdE+tpE4IVaaiT1okTtZrZ PDYb+pKRZwZJCMb18YAOeOc= X-Google-Smtp-Source: AGRyM1shgJ8iVuBfVAGM8u07JMkbeCYmk9v/QuW7OvpREHWc7F/JnbQ/vH8RLlSBn51LTF42dAFNgA== X-Received: by 2002:a05:6402:1859:b0:43c:b0db:3f9a with SMTP id v25-20020a056402185900b0043cb0db3f9amr2474362edy.120.1659082467018; Fri, 29 Jul 2022 01:14:27 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id 24-20020a170906301800b007262a1c8d20sm1402066ejz.19.2022.07.29.01.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:26 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:25 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] staging: vt6655: Rename function MACvReceive0 and add parameter 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 MACvReceive0 function to vt6655_mac_dma_ctl to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Add one parameter to avoid multiple repetitions of the same function. Signed-off-by: Philipp Hortmann --- V1 -> V2: Combind patch "Add parameter to function vt..." with this one Changed order of renaming function and conversion to function Improved patch description --- drivers/staging/vt6655/device_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 39bfbb1ab742..fb40d71d9e8e 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -205,15 +205,15 @@ static void vt6655_mac_read_ether_addr(void __iomem *= iobase, u8 *mac_addr) iowrite8(0, iobase + MAC_REG_PAGE1SEL); } =20 -static void MACvReceive0(void __iomem *iobase) +static void vt6655_mac_dma_ctl(void __iomem *iobase, u8 reg_index) { u32 reg_value; =20 - reg_value =3D ioread32(iobase + MAC_REG_RXDMACTL0); + reg_value =3D ioread32(iobase + reg_index); if (reg_value & DMACTL_RUN) - iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); + iowrite32(DMACTL_WAKE, iobase + reg_index); else - iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); + iowrite32(DMACTL_RUN, iobase + reg_index); } =20 /* @@ -431,7 +431,7 @@ static void device_init_registers(struct vnt_private *p= riv) vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); =20 /* Turn On Rx DMA */ - MACvReceive0(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); MACvReceive1(priv->port_offset); =20 /* start the adapter */ @@ -1146,7 +1146,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) =20 isr =3D ioread32(priv->port_offset + MAC_REG_ISR); =20 - MACvReceive0(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); MACvReceive1(priv->port_offset); =20 if (max_count > priv->opts.int_works) --=20 2.37.1 From nobody Sat Apr 18 09:30:54 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 D6457C00144 for ; Fri, 29 Jul 2022 08:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235637AbiG2IOx (ORCPT ); Fri, 29 Jul 2022 04:14:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235557AbiG2IOk (ORCPT ); Fri, 29 Jul 2022 04:14:40 -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 8FF3282101 for ; Fri, 29 Jul 2022 01:14:38 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id v17so4926330edc.1 for ; Fri, 29 Jul 2022 01:14: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=Bql96rsyZxB76GDg2PMxZ15XLQXYm6iZUZ1zvDkMvNM=; b=RJLshvwMru71GvjWyDbiCin6AFbkYpMBDFCoG5TtILNQMMPHK9ttWtrN+P+e214ZUc D1XWjjWlDNaHJrOru/2nzk+G6M06RSPJ0SXrTswnEA8naFIBZfP6IjmSJ88Ig5s4TuyI QDP99YVuBwf8hXpZNmkreGb1eJzuvalx9KP5V3T1jglh61Vuq56gBUGiiA9mbjNGFWoH gGkg2RdzdJaa4kQcx1V12UBHmMBDrR3puAhyhdX5nEy5Jc3hLnw6e34vgJGjj8Eu23/5 zSS8BZ9UI3YgEce8DNpc09A8Ijpe4T9v1uQaOYrteNj5fd8WoZfm8pxFc6DjnWEW7A7l NNaw== 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=Bql96rsyZxB76GDg2PMxZ15XLQXYm6iZUZ1zvDkMvNM=; b=TIGiZLfsmFthAUra07a4igVngEXODnkgWdywYP4g1AuC49NUlLxU21kaJsC0hl1C6D N1I6ud4SaMBImuvesLBSU/q0dVvWqAwMP6GyKT2UENbvdDmpG247+m/tVcIQaEUQnEJz M4SwFHmlZWAVV8G5bfGPdLiS/UeSaZJmhdaAAB6jT1N4LbmK9taAyatO+bBpQLXHw/eP QMQnPdNDcDsJ2QsryKtHd0PYZP6MdKZl7qKMIlNA3tF5GSAEb1qtP2u1j/uJRhetPGhX lImLn0WXd/J0zUg4LHkKxYS7M5WEzsgjePixOKeadE0Zpdewk/O7jZ1FEcgd53koBVM/ fzVQ== X-Gm-Message-State: AJIora9PqlwF60+LnifJr2W36xrvmir5f1h606qdAGByPBmB868d6YmY IBnrqAeWFRq3vw4M18UY/ww= X-Google-Smtp-Source: AGRyM1uIBPYb3HQEI97ljYGfZYV5BFMyBeQmFBpOCMGfiks5T97fBYVnGRRiqpgq772bFwPNhZ82pg== X-Received: by 2002:aa7:de85:0:b0:43a:d89f:1c7b with SMTP id j5-20020aa7de85000000b0043ad89f1c7bmr2438607edv.17.1659082476883; Fri, 29 Jul 2022 01:14:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id 18-20020a170906201200b006fee98045cdsm344073ejo.10.2022.07.29.01.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:36 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:34 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] staging: vt6655: Replace MACvReceive1 with function vt6655_mac_dma_ctl 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 MACvReceive1 to existing static function. This saves codelines and multiline macros are not liked by kernel community. Signed-off-by: Philipp Hortmann --- V1 -> V2: Improved description --- drivers/staging/vt6655/device_main.c | 4 ++-- drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index fb40d71d9e8e..554531411dad 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -432,7 +432,7 @@ static void device_init_registers(struct vnt_private *p= riv) =20 /* Turn On Rx DMA */ vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); - MACvReceive1(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1); =20 /* start the adapter */ iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, priv->port_offset + MA= C_REG_HOSTCR); @@ -1147,7 +1147,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) isr =3D ioread32(priv->port_offset + MAC_REG_ISR); =20 vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); - MACvReceive1(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1); =20 if (max_count > priv->opts.int_works) break; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index d21313f3067e..5a473ca393f2 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define MACvReceive1(iobase) \ -do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL1); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL1); \ -} while (0) - #define MACvTransmit0(iobase) \ do { \ unsigned long dwData; \ --=20 2.37.1 From nobody Sat Apr 18 09:30:54 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 30E32C00144 for ; Fri, 29 Jul 2022 08:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235585AbiG2IPG (ORCPT ); Fri, 29 Jul 2022 04:15:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235601AbiG2IOw (ORCPT ); Fri, 29 Jul 2022 04:14:52 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55BA8820FA for ; Fri, 29 Jul 2022 01:14:50 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id va17so7328040ejb.0 for ; Fri, 29 Jul 2022 01:14:50 -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=o4vW0UYou3fHkj8i9Q3MbAUiW6l95nNxKH7RBWOhBEI=; b=lM41+MOeWZIf+vIEDgI8G7YilKe6uV5Zid5DRANx70RDlgn0OB//yD/7Kp2VTM7fQv XmDkmzk4SuUHVxipxh31weWXMm5GCRoXOZhHxptSv8tnZA3qqiRZtFG8TGrjJy+JZeUe KpgtlZgDQMkY6YWrpTzQzbYiFJz7OR0sP7Tq8JeW3R11Hbp8ccdq3IgIkVQDqa9i91vP JMnI4yYlSNcKfqV5G8wN6/MeOVfxBLp6xkuBpmmaZOay/1uz8CYDV/ARJwmA3TVnJ8qh NUbhgbbrGU5KmGaXdmR+pG881h1KkGjc9egMVxo033NqaL3sLJm1MlRKeO7vb1bNOj0I 8unQ== 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=o4vW0UYou3fHkj8i9Q3MbAUiW6l95nNxKH7RBWOhBEI=; b=w3Eo3q4spbYtLg9S7JRqaWnkIQ0gvttXE8UsDjPn7xwmhA3qwk/sZksfgmFIwIv1Pd jRwm1uGhtAgQyg1Zvvmna1KglN9bte6gHSYqaGKvsLWqm611e6ECOLmsLn9mFvAhvY7i V3cgOE0F3jeXU8T4RRi1GHoERdcgoF1j9plA4K6MHu2m4n1m9kan7qSA89S2tqdsVA0U FQPVN2dp8WO7vmwlgGGHwEQB+oaV+f5VMkIvI6+ykg1hbW+vCBZl5SGx/9K1xh4Qvv5g eCcBeiMpbKRQkx1G+PgxGUn6Mvr5UKh6nBx+t9ms2cAP0xTP1+xnsflIiHaSLxWvlJp5 Nvkw== X-Gm-Message-State: AJIora+e+SkepfDt8m3hDfkLfpbyntH3AuH8tINo2zW0E1n3j+b0J9vQ SmvUjcMuxI8pMD1OYg047yI= X-Google-Smtp-Source: AGRyM1sDnGUVNtE6Vg/PEwO4s6uCfhUYlEE65SUIGxzr2DtcT6sswobLgFBi51+WLA2N8xrk6S/bEg== X-Received: by 2002:a17:907:d1f:b0:72f:5d89:d08 with SMTP id gn31-20020a1709070d1f00b0072f5d890d08mr2037896ejc.231.1659082488852; Fri, 29 Jul 2022 01:14:48 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id ku24-20020a170907789800b006fed062c68esm1369857ejc.182.2022.07.29.01.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:48 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:46 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] staging: vt6655: Replace MACvTransmit0 with function vt6655_mac_dma_ctl 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 MACvTransmit0 to existing static function. This saves codelines and multiline macros are not liked by kernel community. Signed-off-by: Philipp Hortmann --- V1 -> V2: Improved description --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 554531411dad..c0a00063e4d1 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1231,7 +1231,7 @@ static int vnt_tx_packet(struct vnt_private *priv, st= ruct sk_buff *skb) if (head_td->td_info->flags & TD_FLAGS_NETIF_SKB) MACvTransmitAC0(priv->port_offset); else - MACvTransmit0(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_TXDMACTL0); =20 priv->iTDUsed[dma_idx]++; =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 5a473ca393f2..be33da59dd84 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define MACvTransmit0(iobase) \ -do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_TXDMACTL0); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_TXDMACTL0); \ -} while (0) - #define MACvTransmitAC0(iobase) \ do { \ unsigned long dwData; \ --=20 2.37.1 From nobody Sat Apr 18 09:30:54 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 59950C00144 for ; Fri, 29 Jul 2022 08:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235575AbiG2IPR (ORCPT ); Fri, 29 Jul 2022 04:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235591AbiG2IPB (ORCPT ); Fri, 29 Jul 2022 04:15:01 -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 6FD4F82137 for ; Fri, 29 Jul 2022 01:15:00 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id z18so4881382edb.10 for ; Fri, 29 Jul 2022 01:15:00 -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=hbLEgaxrLrA+lt0pf8j+1LPKczyD5CeM4DOxfzFvdCs=; b=UtRFL4OFdw21a1MrnvF8HlG/tm8pt0PEjiZNotdSR+BXvB4e7QtRZZkSIGTBvpjbXP 6jZEiswjrUCJPtJLv6zodOv2cZQyEUT4Ecq6wZ9JfGo3zZbpnBXhznanYKKOhhDb7vBI WIOuT3vwx2N/H0JGHIr8y5I0wvMe9e76kLTJdTJIdlX1+KvKtfQVL6Qt/kjmqKd81QLo 7wZm7AuyZ45vPVPc0Jpy+dZBl4S4bqE6r3lD2vUGmJyvBa6Gp87rVFqzd/0g5qA440W0 31jfc8ZGYSdA5wtsxdQyIcFLky8GTCdCTKaBcvW76Arpt+iZyJv/8GfiMUvTNF2I1RGT a/1g== 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=hbLEgaxrLrA+lt0pf8j+1LPKczyD5CeM4DOxfzFvdCs=; b=CX4dwEjDsb5cNoulIxGPkeDAj0ovZu3PFdal4JD9aWpQiT8YKVLsXfwuxPs+rQhFB3 cn6X3+Qve83GZJ42xBvV6s426UoL9mjSDnUmPP2LTKJaoT0pKkS+NGnKcT5R00bsr8wh QEk8kN9b1J6HMF21bkJS4rpxBKA5wkliU1DurcbDelN5dQXFPg5bpgX3cYSfXMDu+vPs vgbuu80UDYwwkv1Uivx9snyJtqefl056LSSSRExjexHS8XCSI5h3OOp8QH9VFyl2Vcr5 C0VXTlGW3z2au7CviodSZ9zQ3Izql3UVcrFidEixYyAtfJR1kH/iwUE2LvvEKg1BkIun szDA== X-Gm-Message-State: AJIora9z8LC1y67MCc3x1SpDDy8D0x8ig5Gxv5qFzx0RgKvZymSHDi9I Bp+3+K/zsSR+DpO8UEFozCw= X-Google-Smtp-Source: AGRyM1uBjg5FfYexSGWqbMQKasmzKoc95hUfYfTRSjIi+l2ZvqN4q0bCCK7juB1Sa85VO+6nQDv4lg== X-Received: by 2002:aa7:dbd9:0:b0:43b:6e02:7e37 with SMTP id v25-20020aa7dbd9000000b0043b6e027e37mr2455217edt.341.1659082499073; Fri, 29 Jul 2022 01:14:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id ee24-20020a056402291800b0043b7917b1a4sm1971865edb.43.2022.07.29.01.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:58 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:57 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] staging: vt6655: Replace MACvTransmitAC0 with function vt6655_mac_dma_ctl Message-ID: <013abd177d9ac129c034776f10cdf823fd87d781.1659080988.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" Convert macro MACvTransmitAC0 to existing static function. This saves codelines and multiline macros are not liked by kernel community. Signed-off-by: Philipp Hortmann --- V1 -> V2: Improved description --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index c0a00063e4d1..1fc8bdf8a311 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1229,7 +1229,7 @@ static int vnt_tx_packet(struct vnt_private *priv, st= ruct sk_buff *skb) wmb(); /* second memory barrier */ =20 if (head_td->td_info->flags & TD_FLAGS_NETIF_SKB) - MACvTransmitAC0(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_AC0DMACTL); else vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_TXDMACTL0); =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index be33da59dd84..467c599a3289 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define MACvTransmitAC0(iobase) \ -do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_AC0DMACTL); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ -} while (0) - #define MACvSelectPage0(iobase) \ iowrite8(0, iobase + MAC_REG_PAGE1SEL) =20 --=20 2.37.1