From nobody Sat Apr 18 05:48:41 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 7C77FC43334 for ; Sun, 17 Jul 2022 22:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbiGQWUP (ORCPT ); Sun, 17 Jul 2022 18:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbiGQWUM (ORCPT ); Sun, 17 Jul 2022 18:20:12 -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 C85C01274D for ; Sun, 17 Jul 2022 15:20:11 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id j22so18327600ejs.2 for ; Sun, 17 Jul 2022 15:20: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=ER+wlmwgWW3cJhjmYLRX0mj3AW4fGnQUl6MKua+ERA0=; b=egnh8gJ6gvdtwfYwLGH1oxRefUzeuZsf7BuZk3+wRnNACbIgkzrFq71omHmwltzKMM 9bzHf6J1HCms1r04n6s6K4M3WpzWCkIF+H/eASzYyDLrT685Ugpsx5Jwcqvur/ZtbrGe c5P8FX6nVMIzVLKGazf97Je09F20bAmkxzT9Ak+kIDwS2SASqDNrm8Xjza8ENxKaqwvw yAnhHBgQBuHw35P6eY5BpMMhkUFuvGXAi2vnRDFdK70fPcy7y4IbWzEsBqjX7zpHKh8n K7wqtXcInI3Z4KTU54FkNsTbrmnHdJcgaIicYRtV0SwbszeC3ZVo8dAUE+tsJ1AssxCG EmuA== 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=ER+wlmwgWW3cJhjmYLRX0mj3AW4fGnQUl6MKua+ERA0=; b=ivmY6g0A29osRZw7SWL2+M1nOeRP+Q1VEEqc6MT3PQahxffsmk2Ej0rqh72RFJnfKa bE4ka/jx7BTdPv7tnYXrCRHri7roNqAOn1X2HpvY6L4PxTE3Asz4Ys6o6Hox0GSNoFdg ZD8IIy0rnlx7l9kAmhGl2TMWYPn06gLaZgetMkOcPq2FoP7hEpAANr36SusR6z4bn9H2 Uoix0ioUv6zr+LIvZh1VUq8ncn3R56cRpCCt0vefxRVVYk4CWIgBF8bep/QULOrZXLUU pkoNXQm+Zp7TbEFUqr75IrqVa7q3QZ/lfD00mmhz8BkkAQWQywph1ZGovRjjj+JvCEls 32qw== X-Gm-Message-State: AJIora+qVkRxXGAhJBEhwuKUppHyX1W+4eD0rpYqeLfut7rOQvXTNE6F OOopNopQ3dhlORXSZcdBtCI= X-Google-Smtp-Source: AGRyM1uDFea9JW//11M9yCM7Lw/U2tgXSLxucFib47swRpXoGt0xgvh4znDtoHqMnYd/dQ/d3ds14A== X-Received: by 2002:a17:906:216:b0:711:f623:8bb0 with SMTP id 22-20020a170906021600b00711f6238bb0mr24012671ejd.174.1658096410414; Sun, 17 Jul 2022 15:20:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id f8-20020a056402160800b0043b0cd89d99sm7427924edv.32.2022.07.17.15.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:09 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:08 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] staging: vt6655: Rename dwData to reg_value in 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" Fix name of a variable in four macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b307161818a0..bfcbeb96f839 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -539,9 +539,9 @@ =20 #define MACvReceive0(iobase) \ do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_RXDMACTL0); \ - if (dwData & DMACTL_RUN) \ + unsigned long 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); \ @@ -549,9 +549,9 @@ do { \ =20 #define MACvReceive1(iobase) \ do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ - if (dwData & DMACTL_RUN) \ + unsigned long reg_value; \ + reg_value =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ + if (reg_value & DMACTL_RUN) \ iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL1); \ else \ iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL1); \ @@ -559,9 +559,9 @@ do { \ =20 #define MACvTransmit0(iobase) \ do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ - if (dwData & DMACTL_RUN) \ + unsigned long reg_value; \ + reg_value =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ + if (reg_value & DMACTL_RUN) \ iowrite32(DMACTL_WAKE, iobase + MAC_REG_TXDMACTL0); \ else \ iowrite32(DMACTL_RUN, iobase + MAC_REG_TXDMACTL0); \ @@ -569,9 +569,9 @@ do { \ =20 #define MACvTransmitAC0(iobase) \ do { \ - unsigned long dwData; \ - dwData =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ - if (dwData & DMACTL_RUN) \ + unsigned long reg_value; \ + reg_value =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ + if (reg_value & DMACTL_RUN) \ iowrite32(DMACTL_WAKE, iobase + MAC_REG_AC0DMACTL); \ else \ iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ --=20 2.37.1 From nobody Sat Apr 18 05:48:41 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 C6629C43334 for ; Sun, 17 Jul 2022 22:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230475AbiGQWUU (ORCPT ); Sun, 17 Jul 2022 18:20:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230179AbiGQWUR (ORCPT ); Sun, 17 Jul 2022 18:20:17 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 415CD1274D for ; Sun, 17 Jul 2022 15:20:16 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id b11so18271453eju.10 for ; Sun, 17 Jul 2022 15:20:16 -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=nyzrG7hvu7Tya4/vV8pmII/H6wDDB9RTk/WzCNXAw9k=; b=M9RYUWBwLBPtjW4ovR1ITfkUnU/FcuZHLn29wzsdn4rBpldeNcGF675pbUpUzFyNch l4frv/nTU/6Cw8AjtSyECcnyyk1DuGJ14R8B3QwGt9Ox8pfwR98Ce8gNDNzND0jxZlEl OGxGDyQxXTlneyhH7cXYkUfYUFklQ8VfCMNgz0mZfrEf7crtrFPS96tgtfOtns70dLpL 1fYW7fiqseVLI6XixVxBvjAJFzfeerlLd4VonVzJSR3BAAxagujuF3yz8BNnXCsUyp3x DapkBkQZJsGf3VyHlcNo5prpWiNHQ/k85XQf/ki1CklJW80PIEwwIFHd80FJm1FVPdOx uMnA== 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=nyzrG7hvu7Tya4/vV8pmII/H6wDDB9RTk/WzCNXAw9k=; b=ABKL5/Sfiq2M19rgxznriHBCxg1GHjaeuSfdODi0p0tLv5rN2Our6gkXsTzDiBAfEU HzHQRUpm0dFbxJFaliQestRW8rgD+R2vFBanhNRTGbI9MCTBjWOLOmOC0ENIwbTQszTU TcFyqHPR9LAaTlH/zCOk/+AaKWshCBhrzblP4Qc+eC+oNU+/L5PlW1M/PO0vaRroJ+ve Zaupw3CUPS/w9OPofVV8Rjjt0QTWvWXTLBZP1MBYdAPU9rszK8+rMFEYKhUqc4iixRNl QylZPqzY0i06RVCTQi/O5J47z3b9FoDgLX67F5YhsuXTQc27cSLU4HXw5QXTh+faK4it KQdQ== X-Gm-Message-State: AJIora8SLS28kbUWps8N9RSpyEur6wsJLBmE7p7wzGha0QIG9sjvieL6 J/K1fB+JbAlCEEjkqrkpwSA= X-Google-Smtp-Source: AGRyM1sVirgPePIu4omTVkD83lwQdD6wG5OsPsxHaGxqVVpI8eqVl2tSlKgyQDy5hOknN6dZcFCj/w== X-Received: by 2002:a17:907:75c1:b0:72f:248d:5259 with SMTP id jl1-20020a17090775c100b0072f248d5259mr4103463ejc.227.1658096414764; Sun, 17 Jul 2022 15:20:14 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id h27-20020a170906719b00b0072aeaa1bb5esm4775365ejk.211.2022.07.17.15.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:14 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:12 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] staging: vt6655: Rename MACvReceive0 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" Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- Please read all patches of this series then the new name makes sense. --- 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 92583ee8bffd..6525b7baf644 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -420,7 +420,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); MACvReceive1(priv->port_offset); =20 /* start the adapter */ @@ -1135,7 +1135,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); MACvReceive1(priv->port_offset); =20 if (max_count > priv->opts.int_works) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index bfcbeb96f839..60e0f980bcc5 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,7 +537,7 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define MACvReceive0(iobase) \ +#define vt6655_mac_dma_ctl(iobase) \ do { \ unsigned long reg_value; \ reg_value =3D ioread32(iobase + MAC_REG_RXDMACTL0); \ --=20 2.37.1 From nobody Sat Apr 18 05:48:41 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 DF3EFC433EF for ; Sun, 17 Jul 2022 22:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbiGQWU0 (ORCPT ); Sun, 17 Jul 2022 18:20:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231300AbiGQWUX (ORCPT ); Sun, 17 Jul 2022 18:20:23 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B64E1274F for ; Sun, 17 Jul 2022 15:20:21 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id k30so13066810edk.8 for ; Sun, 17 Jul 2022 15:20:21 -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=En7+TVW64zRoyWuupOH6lOq4ewhG8jBuFQhAW9bo4EA=; b=LGJfl36f2O5Bm4X8ngpgpR0b/dXKh54Pz+lSzrGO2ewRUh7MXkdn+lHpICU07SeFPr ka8Cr/uDsKpZsxiW+vXyqCLKN0dw4PGJ3kSR0AWJEcR+zqclLPu/c/byO73dnFCtwqra BGtMAT+o7NgoWvqopCgPoarEVOPxJ/kc/g4RYa4djeNVRziKAFxBze1q512kbmOJ1AIr aNFclHjg86p+9V7XIrYfAmdtuoQcuI1KED1zngJDJqP72eG3ONd+NrYPiJ4Ct6h6ksaL etp9pgDwoGzalpuwh++xHmpB/kxCnEqjT+ydvqJo+z2MLJTJ2zijSH+ek2ZubnIOGQSU GIGw== 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=En7+TVW64zRoyWuupOH6lOq4ewhG8jBuFQhAW9bo4EA=; b=NZst6wAAktUS1tzA+WcssEMZW09bDESyej5Bl7t2dOcFsZo8ecqq4w3q4pJ4hLAh5G UYVAHXmqlh5XJ7W0Hd3h7UmX6GS23O/+q/4QI5Oq7j0zz5VW+2iFvQMHtTse7yVsRtmd kI66Oa6Ph59t0SbnIL1n2odSUGbRNOGemAA+r5EM7LBO6SuNNtp0QgqqcuFYBOfLvGvz lLGSp/2isHF5EEIfNTxyBAHZTFzo5FqJFQrENDx7l0qjw+TYTSM+gstMqk8s6fUIrUFI +jKFLQRgMXNER6zagy5rK4ZrkNr8ixvwoqYDCj4xbbP+AajlYftzwG25Ue/UB3FY/G9k l6ow== X-Gm-Message-State: AJIora9edVFN1eVr1zv9h6xtDXXOu2Ovv+B03GEkXdOgEHRjca+v8R/U BWWeGq5O+1kHduprzk9dhbs= X-Google-Smtp-Source: AGRyM1v9KGKOcZUbjxT7wvkb7MznOd2X7KF/hzjNuGyZ6AHfv3jmJsA5tpyoOmW97+uameJct4uwnA== X-Received: by 2002:a05:6402:3689:b0:43a:7c1c:8960 with SMTP id ej9-20020a056402368900b0043a7c1c8960mr32930306edb.79.1658096419075; Sun, 17 Jul 2022 15:20:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id le20-20020a170906ae1400b00724261b592esm4723424ejb.186.2022.07.17.15.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:18 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:16 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] staging: vt6655: Convert macro vt6655_mac_dma_ctl 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 vt6655_mac_dma_ctl to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 13 +++++++++++++ drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 6525b7baf644..cf25644f8671 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -125,6 +125,8 @@ static void device_print_info(struct vnt_private *priv); static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *ma= c_addr); static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr); =20 +static void vt6655_mac_dma_ctl(void __iomem *iobase); + static int device_init_rd0_ring(struct vnt_private *priv); static int device_init_rd1_ring(struct vnt_private *priv); static int device_init_td0_ring(struct vnt_private *priv); @@ -205,6 +207,17 @@ static void vt6655_mac_read_ether_addr(void __iomem *i= obase, u8 *mac_addr) iowrite8(0, iobase + MAC_REG_PAGE1SEL); } =20 +static void vt6655_mac_dma_ctl(void __iomem *iobase) +{ + unsigned long 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 60e0f980bcc5..5747de436911 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ =20 /*--------------------- Export Macros ------------------------------*/ =20 -#define vt6655_mac_dma_ctl(iobase) \ -do { \ - unsigned long 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); \ -} while (0) - #define MACvReceive1(iobase) \ do { \ unsigned long reg_value; \ --=20 2.37.1 From nobody Sat Apr 18 05:48:41 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 AD515C433EF for ; Sun, 17 Jul 2022 22:20:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231781AbiGQWUb (ORCPT ); Sun, 17 Jul 2022 18:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbiGQWU1 (ORCPT ); Sun, 17 Jul 2022 18:20:27 -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 89E0112AC8 for ; Sun, 17 Jul 2022 15:20:25 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id z22so95847edd.6 for ; Sun, 17 Jul 2022 15:20:25 -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=CS/R4BBOiK/7PZe73tLvElDqF+cKw+/gEyRw36JfpCc=; b=MWAXpn5nsIZh8pGmb2NsgT4fEYy+1zmp2gxD9Wpzz1OzoZAD17GAtDydbKj6ACLFKy tDBmm1EIlKl9SBBDpH6sSE+txzuZVlDS6ZuH9HiDRQbmXFlks6K0flkH32Byavjvo6qR 3WzstgE0a1kLsdrC1ahHA4qognmTNqat77FTV6CkXbMRY7GsbW/5SAsSwV5/o1ziLEU8 mvfXDnj1eDpirND6XgyQSIqJ/2imykM5NbrkjGbqrNEOQajhj/cr71XUfe2U3TaLRsXN /4KCSXUtXP5Pkme1xPhoIvw5BMZ7NByGR/oOdAYLqwxU/0OqP5TdpJd6rcBqdvEFSMg0 8Gxw== 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=CS/R4BBOiK/7PZe73tLvElDqF+cKw+/gEyRw36JfpCc=; b=qoLc/vu3vxP4dT6Nt1c0X9DIHbrZUeWGLHlatL7V7ueUaZn/5OGNEubErTHJVgrZ3Q qoYxsC9XSkLXkgiqCgopTsfGraEdQ/bMXaO75hYvNG4C2eOXmFn3reNV2fTdG4liKy6n CtIFrehCxW36pGwCjbqelOWG0G4GGVrEGdZ37UjwGMzsFTShColG3zDhGh8E+dET3dXo BAUHROLztT8JOMtRPEyA+nG3N7kmazMtFOwAVTchCH8sKMbU6bO2uMLNHhD42Zl4Nbyr gKvzXYBnl4TBkA6qoSQc7dxsikNAQcvDqjzqXZBm3XfnIZ4TUe2LvL9EnLPWif1rH1v/ gwOg== X-Gm-Message-State: AJIora9oGthnMOhRCTUUER1nAPyyJ8UB40xaicS/T3qqMxvQRkX6CQ2v jWl3Zn+qknlVEG2+DEA3GDk= X-Google-Smtp-Source: AGRyM1tQtMwf156iGbjB7Yd/tPtQT0oaQ3GrNSPIMSpgvlq2a7N5QBNDa6iUjFN3CUNcyEGyuZ+Gzw== X-Received: by 2002:a05:6402:5418:b0:435:5a48:daa9 with SMTP id ev24-20020a056402541800b004355a48daa9mr33682976edb.304.1658096423688; Sun, 17 Jul 2022 15:20:23 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id kw5-20020a170907770500b0072f07213509sm3178268ejc.12.2022.07.17.15.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:23 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:21 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] staging: vt6655: Add parameter to function vt6655_mac_dma_ctl Message-ID: <476d9023863899ebd6f515e6a5c9022c9fd64d84.1658094708.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" Add one parameter to avoid multiple repetitions of the same macro/function. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index cf25644f8671..31e0e55b9220 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -125,7 +125,7 @@ static void device_print_info(struct vnt_private *priv); static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *ma= c_addr); static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr); =20 -static void vt6655_mac_dma_ctl(void __iomem *iobase); +static void vt6655_mac_dma_ctl(void __iomem *iobase, u8 reg_index); =20 static int device_init_rd0_ring(struct vnt_private *priv); static int device_init_rd1_ring(struct vnt_private *priv); @@ -207,15 +207,15 @@ static void vt6655_mac_read_ether_addr(void __iomem *= iobase, u8 *mac_addr) iowrite8(0, iobase + MAC_REG_PAGE1SEL); } =20 -static void vt6655_mac_dma_ctl(void __iomem *iobase) +static void vt6655_mac_dma_ctl(void __iomem *iobase, u8 reg_index) { unsigned long 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 /* @@ -433,7 +433,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 */ - vt6655_mac_dma_ctl(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); MACvReceive1(priv->port_offset); =20 /* start the adapter */ @@ -1148,7 +1148,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) =20 isr =3D ioread32(priv->port_offset + MAC_REG_ISR); =20 - vt6655_mac_dma_ctl(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 05:48:41 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 D9CADC43334 for ; Sun, 17 Jul 2022 22:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230403AbiGQWUk (ORCPT ); Sun, 17 Jul 2022 18:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbiGQWUe (ORCPT ); Sun, 17 Jul 2022 18:20:34 -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 73E9C12AF6 for ; Sun, 17 Jul 2022 15:20:29 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id oy13so18291362ejb.1 for ; Sun, 17 Jul 2022 15:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=OnSb4cWLjt1pnom/8Wk4obyvClEVJICo+D/S3R4PBI4=; b=G3FtfebYwFbuog5iXivUQ61G4ZOlpCRwTGQJbG8p7Op3yRfieh7Csn5gpHNJ8nNw2e OAVyuIeQ1ddoC7cGyxbviPgL87LtvxPN5+ZiLDyflV8mlYtxeT0kVZj0P9vIvN2Nvp3X SWO4XRRbZ/BGWbETa3Z5FC5cGPPBxMVv+Q0RviL7RnJCHVBg+g+WrZBQhc41COjgPcbp 6bfiDj1C7SwbuQR9KYIuoaeL7s7rBdYliBbCDPc1lFcuasjxPKGIje5/rTQVCegRmVIV dRBzYkMPmbocw3xCLfkn35kqCWCwJzy8M6b1kEOvtqS0mUge4LVryBxbIA/xoo0gQI98 1yTg== 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=OnSb4cWLjt1pnom/8Wk4obyvClEVJICo+D/S3R4PBI4=; b=Xrf/TojMIyP/bvJuIVGGdca8rIrjK8/v09HftNVKZMLQLUVgpQ2NsMI7rqQYkC5qMM mDT/HwEFfMnpF6bbmlxp1F+MQdsHz/UNEnkaTywOAN91nXoma9XdzYDP3qeEdSRKP/q3 dxmtVwTFy7Q9gp0/qRvxKh9W/cFWaMucAAT72rfgFi//oAnjruUbU9kixxlM8bp9L4ZR 1j3636xd6mP2pCGFTKm2aHBmt8DKPekYKU1zkAH+GCgSLqw1N935H+PVH491wmae5kGx BC4jZdZoZdlSPoA/nuzMVK1fTgQ5iDeXvZGJnFWH0FKVkF0RkJ43TuttByH6mGz9syUh 4BBw== X-Gm-Message-State: AJIora85uFNBJruD52cpJgBHwDP/tmpdsyeyYLWvx5KM4uMkUY/EQFa1 wdHOs0yFCgoPm68z3TnLAiM= X-Google-Smtp-Source: AGRyM1t/ChPmaw/+zDHud+lvcfgi6W8mcKEtpJXF/7FFipoDl0OeyHnCUKiNZxmT/Dg363MAwymUsw== X-Received: by 2002:a17:907:60c7:b0:72e:d01f:b884 with SMTP id hv7-20020a17090760c700b0072ed01fb884mr19613051ejc.550.1658096427670; Sun, 17 Jul 2022 15:20:27 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id l10-20020a1709060cca00b0070b7875aa6asm4715913ejh.166.2022.07.17.15.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:27 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:25 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] staging: vt6655: 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" checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann --- 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 31e0e55b9220..01ce1c90ab09 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -434,7 +434,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); @@ -1149,7 +1149,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 5747de436911..129a6602f6f0 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 reg_value; \ - reg_value =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ - if (reg_value & 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 reg_value; \ --=20 2.37.1 From nobody Sat Apr 18 05:48:41 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 831A6C433EF for ; Sun, 17 Jul 2022 22:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231822AbiGQWUr (ORCPT ); Sun, 17 Jul 2022 18:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232438AbiGQWUi (ORCPT ); Sun, 17 Jul 2022 18:20:38 -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 A10D112D19 for ; Sun, 17 Jul 2022 15:20:33 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id fy29so17172557ejc.12 for ; Sun, 17 Jul 2022 15:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=72PpzeaJZFk4PpQbNlACBTVQWjfaMdwWFINUxLmL75Y=; b=PpxwV+JtmMmW2wKyhWG92BDNXm/8w5yCz4CrvzNLbtVf2R1MWV87mUGGhT6KebFgGA zFDth2KIpoYgsPMaIx5lulyNBpRkfd7qwVkyQ808B0K5REfps3GBXdXPKJ2FSMI5piIG 3iET1LCQ+3r+qxvOaoioPy1T8sIW/4ivf/7EM/hm8vnu6JY3ekogIkEUEB/AHSWmPrvQ fnDKZNQKvgACe3zyOUpAvxe7xPGV7Uk48lFG7JL5yH7e1YXaeQb2wDPnHz5UHAfKfzR3 pvvOgWTHh2+R7hbTw0o7hwVFmCE9RV+YuSp6Qs0NHJOjSQrv7IugA8roAKaOOvssw1NV C2sQ== 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=72PpzeaJZFk4PpQbNlACBTVQWjfaMdwWFINUxLmL75Y=; b=o5c297q4Vv8p7AdBDw1czQAO5ptUmeeINZz8r6/mCYLoSJKmf1/7i9+n3eI5h+ph+1 a1eXj15qZWqdJbvnaRjsQQdi+weYKbcSPHIdhV4iL29bLbU4inlHE2IWKmTDfbSCCfmU 7pyBWSFzWDbcaC9BuuGCGY0Z2JGcLTQ3e1x8mBUgTJQP+dyfBDiOjtRy7G6y4QxY4O8d XkxCGwkF/MSzPpgJ1jRF6aZlVixF7RQjj7RJupKPgS+p/VxmsFif3SQ6Dl/h9MkA0VvC fRsHqbIRfFSLuSou8I8fDjUeZvKIxQandPm7+hyNEXh/DghbEozyI/GY9wcrumfn4GoR KIZA== X-Gm-Message-State: AJIora9J89AguSHq80llSS4oEDcvWlTUB8fna063sDvpfLKyAp3IbRH6 D9TQCdiiXzXZv/fRPD+HfOz+GkcLarU= X-Google-Smtp-Source: AGRyM1ulMDk311mJBEF/FWugiQ9TEy8LgpVIAZ+kowZ3keb6STiQARZyJ7+QQCUf8k4/Ys7OKFSEoQ== X-Received: by 2002:a17:907:9627:b0:72b:6d22:4334 with SMTP id gb39-20020a170907962700b0072b6d224334mr22866780ejc.506.1658096431794; Sun, 17 Jul 2022 15:20:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id l12-20020a056402028c00b004355d27799fsm7327025edv.96.2022.07.17.15.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:31 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:29 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] staging: vt6655: Replace MACvTransmit0 with function vt6655_mac_dma_ctl Message-ID: <5d1723b082b7f2583dfa9e1590178380752cf647.1658094708.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" checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann --- 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 01ce1c90ab09..898e06958203 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1233,7 +1233,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 129a6602f6f0..1e57663ff066 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 reg_value; \ - reg_value =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ - if (reg_value & 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 reg_value; \ --=20 2.37.1 From nobody Sat Apr 18 05:48:41 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 237A5C433EF for ; Sun, 17 Jul 2022 22:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233090AbiGQWU4 (ORCPT ); Sun, 17 Jul 2022 18:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232017AbiGQWUn (ORCPT ); Sun, 17 Jul 2022 18:20:43 -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 5A99312754 for ; Sun, 17 Jul 2022 15:20:37 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id x91so13101273ede.1 for ; Sun, 17 Jul 2022 15:20:37 -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=RWNQE77fh9ZO8FyPScCRUXIEK6xi6nY3gZ/2KBXr1no=; b=R9TG6huq1rSfwYmKo7BqWKnUxusQWrr5J/h+2zhgjGWtpnuR/HZ7U5l6l0xBIIWwNd JKGhlJzZs3Dtv71V7bDZ0+nqERZmPsw9EcTxYblyLDIlMfBtvasP/HPTFbnSxgSnD0BP k+y/VU+USR0GncQgEBgAawkeoEWaHUJwnIHswFCXD+02hQal3575PNC2daldOGJ0yKBM xxFKsl4/tHbo8IHrq0pCJChumk0iIoMjh+sgAmFqZC++aXLtl1hozWbC/SWfPXTO6NDg N2vhGsZKu63mMOWc5X6vBcFqBnU0MT8MESIYbUEUGqKRdXgyBhJsejWkj9Q3VrXTF0Va 6qag== 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=RWNQE77fh9ZO8FyPScCRUXIEK6xi6nY3gZ/2KBXr1no=; b=xoKhZb5/nZHG/aFflOM1UGRvfPq17+qnuBovGKi+3EOOqjA970iNe3Usd5L1pFZy1v MG58+CFvmsYH+v7dR2dsAUs/VRQsUVjGeGsxT3v6VSbhYtD8KFMwFntCBx1sObl4LsYN FoZWeYi4d2AESm1dx5SgMKShEzLY3AxZ1wGfqQyvmFiO3vMLSCmb2NrSbNl34jVKxzup DSA1ICmE+Qt3P8RsxUTn3UzFhpmEL4euMllA2Af5n6xaIkUZvHIImDcDcbTX2G4NTTT7 XP14dIKu4h1KIThf/fOYxYCXo/2lcV+A+8Jm9sj3u87raTWKYTYMPP6E1dD2j8wJeqLw QOcw== X-Gm-Message-State: AJIora/C1seohdUOfdtHbnphP2ume11vXsRxZnWB7DjhUq3l+J0MGkIE vo/Nx+wgEbuneuim48jGQBM= X-Google-Smtp-Source: AGRyM1tTenj57kboVS6PEUTMQtPa+0+328zk9VkRUSrxA5Dk3CDE19uoT4xQv7SueFQnk3IYmkSvpg== X-Received: by 2002:a05:6402:2812:b0:43a:9041:d5db with SMTP id h18-20020a056402281200b0043a9041d5dbmr33168956ede.208.1658096435979; Sun, 17 Jul 2022 15:20:35 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0072afb6d4d6fsm4883034eja.171.2022.07.17.15.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 15:20:35 -0700 (PDT) Date: Mon, 18 Jul 2022 00:20:33 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] staging: vt6655: Replace MACvTransmitAC0 with function vt6655_mac_dma_ctl Message-ID: <1e475fbda07a69b7b3cf53fd18bd0390e87ebfe2.1658094708.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" checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann --- 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 898e06958203..b2f3174f80df 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) 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 1e57663ff066..e2ef8c6ef7b7 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 reg_value; \ - reg_value =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ - if (reg_value & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_AC0DMACTL); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ -} while (0) - #define MACvClearStckDS(iobase) \ do { \ unsigned char byOrgValue; \ --=20 2.37.1