From nobody Wed Apr 8 10:13:38 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 C8D05ECAAA1 for ; Sun, 11 Sep 2022 10:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230193AbiIKKpg (ORCPT ); Sun, 11 Sep 2022 06:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230181AbiIKKpd (ORCPT ); Sun, 11 Sep 2022 06:45:33 -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 D1B8E1A80D for ; Sun, 11 Sep 2022 03:45:32 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id r17so13948094ejy.9 for ; Sun, 11 Sep 2022 03:45:32 -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:subject:date; bh=gV8fTFzQ9QuQyibPPmknRwrm0cpQSXvIjVeP1F06DNg=; b=aImQoD96l+vLllY9AvIKt8nI7o1w2Xb1S/g5l2fnTZpf/IClk/HYfJHkooHJduJ4aS PqcOeCg3uxkzfIiXkKHpqnTHrDa4nIpq58taNErtoerFWwxbsC5YVzKla3DuoYnAFpIm 6aGkpvnkjfCLHI6lLlO8bY9I9U/IhObgpWZDXe1h1dfARwg9Rh3Ph4tdpx7a72QoPKBD Ixcdoh8ef3Bq3W1B7INUWF+WJyAUt3Af9aKab7974EB/AP+VnbXZozfLyx8BjjObuAS+ YR+W+Il+uwOwq11+GWXQOW6lW5H6DPObc8Y1rsRNAw2KHsOUBsOqBLCzMIx774fTlymS NkwA== 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:subject:date; bh=gV8fTFzQ9QuQyibPPmknRwrm0cpQSXvIjVeP1F06DNg=; b=IywmMzXWpIjpbZ+zwBGUwkR3dvJGjSA7xJ1mp8cGmqOUhX9pvotcCdAPz1tKj+utDp UFMffU2Jq+0ilcWvUqTHLkx97FcpYozsd95qoIp5ITtTxgu4R9wkq9CWxwHoXkWuRQvj SXX9ecnYvj003AzpVjwTS5vSb9vyOwpKSJNwjQJ7Uxj+jODEEt2P+u2pFuM7YTr/Z/0b wBL0F+QevyOlC989YDZgAXhvvs/TuTIMeD7UveZ39czK9fr4TByS0WnmYkf98SAgySOv AlOkBqSwLeM13sH8HUqkn9r1UP8peY46xAIN8TH3uMbr4NOePDCrOjiJRhBikbMU7FFG cYPg== X-Gm-Message-State: ACgBeo0E7xVQDkiKkjUz/sMgxhajgh53pwBlzoW+p/wLVw1uqP95DRib K9lG1ACmUvmKwmyHLYERiuA= X-Google-Smtp-Source: AA6agR5BK/qFkqEBuGgyTzpznO75iyQspsKyruoPLrI1zWNPN2qwzD3ptUBP6HykL+aZg5DbJ2HMjg== X-Received: by 2002:a17:906:730d:b0:73d:c8a1:a6ae with SMTP id di13-20020a170906730d00b0073dc8a1a6aemr15738297ejc.540.1662893131309; Sun, 11 Sep 2022 03:45:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id t8-20020a170906268800b0073dde7c1767sm2810121ejc.175.2022.09.11.03.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:45:31 -0700 (PDT) Date: Sun, 11 Sep 2022 12:45:29 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/12] staging: vt6655: Cleanup and rename function MACvSetLoopbackMode Message-ID: <02ce61620e13eb7fd24833e59a288f52bf5b9730.1662890990.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 function MACvSetLoopbackMode to vt6655_mac_set_loopback_mode and byLoopbackMode to loopback_mode to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and made function static. Change declaration of loopback_mode to shorten code and remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 17 ++++++++--------- drivers/staging/vt6655/mac.h | 2 -- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index d056df1220d3..567bc38ecfa9 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -13,7 +13,7 @@ * vt6655_mac_is_reg_bits_off - Test if All test Bits Off * vt6655_mac_set_short_retry_limit - Set 802.11 Short Retry limit * MACvSetLongRetryLimit - Set 802.11 Long Retry limit - * MACvSetLoopbackMode - Set MAC Loopback Mode + * vt6655_mac_set_loopback_mode - Set MAC Loopback Mode * MACvSaveContext - Save Context of MAC Registers * MACvRestoreContext - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC @@ -152,21 +152,20 @@ void MACvSetLongRetryLimit(struct vnt_private *priv, * Parameters: * In: * io_base - Base Address for MAC - * byLoopbackMode - Loopback Mode + * loopback_mode - Loopback Mode * Out: * none * * Return Value: none * */ -void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbac= kMode) +static void vt6655_mac_set_loopback_mode(struct vnt_private *priv, u8 loop= back_mode) { void __iomem *io_base =3D priv->port_offset; =20 - byLoopbackMode <<=3D 6; + loopback_mode <<=3D 6; /* set TCR */ - iowrite8((ioread8(io_base + MAC_REG_TEST) & 0x3f) | byLoopbackMode, - io_base + MAC_REG_TEST); + iowrite8((ioread8(io_base + MAC_REG_TEST) & 0x3f) | loopback_mode, io_bas= e + MAC_REG_TEST); } =20 /* @@ -476,13 +475,13 @@ bool MACbShutdown(struct vnt_private *priv) void __iomem *io_base =3D priv->port_offset; /* disable MAC IMR */ iowrite32(0, io_base + MAC_REG_IMR); - MACvSetLoopbackMode(priv, MAC_LB_INTERNAL); + vt6655_mac_set_loopback_mode(priv, MAC_LB_INTERNAL); /* stop the adapter */ if (!MACbSafeStop(priv)) { - MACvSetLoopbackMode(priv, MAC_LB_NONE); + vt6655_mac_set_loopback_mode(priv, MAC_LB_NONE); return false; } - MACvSetLoopbackMode(priv, MAC_LB_NONE); + vt6655_mac_set_loopback_mode(priv, MAC_LB_NONE); return true; } =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index a70e75ff78cd..f7d00a251677 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -553,8 +553,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re =20 void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 -void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbac= kMode); - void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf); void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf); =20 --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 6141FECAAA1 for ; Sun, 11 Sep 2022 10:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230207AbiIKKp5 (ORCPT ); Sun, 11 Sep 2022 06:45:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbiIKKpt (ORCPT ); Sun, 11 Sep 2022 06:45:49 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F787220EA for ; Sun, 11 Sep 2022 03:45:46 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id z21so8907480edi.1 for ; Sun, 11 Sep 2022 03:45:46 -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:subject:date; bh=BiDnhWQR6g6Mj6136/H/ZREAE6myEKa/wQMFwuUDLyQ=; b=eRATwTDb4tdZl8oa9NPKs8lcb0bCZCR2qPAK+hhwflqa+1bjo8vEqFT62P2dNrR91T VeG7EAcrDCeBLmtLmiVar8MHMUJM1ZNd2Pnocpo/BN52kAqshEQ2wyMYA40CPCpQ5Reo l9j6MvTe+woEFXtCuCeXES9JoWfzA2aNKsQ0E87nBzTPEzRp0d0GOPKMWkeTHLHhSXfo a/kzf3+FFNVamDb18sry+56J+4y7Z/SMBUGZtTAhDDtO3s1n+vhwyb701vygyeim9boG aUxHVthaozlWrdFHvZmMxap/ElLmqOXGpkXzff8Za7Bu6p3nnLk/649NKsggI9leQ0x9 mjfw== 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:subject:date; bh=BiDnhWQR6g6Mj6136/H/ZREAE6myEKa/wQMFwuUDLyQ=; b=TTyUex1XrPWqu70NawE+0SvW412IkUwVuqrpr4xEs5bymw5JuK2IqmxwQHjhYp2pV8 Lu+CR0ts7OKe0WOmkx3qLCqkHRNFhPhQG2vgUWS5oWpCK1vBtAqW9taFmwR0WLJW6cmi yAPv2gfNr8b8s8i4/1jjQPVwYsuu2twbFv0Vpq9PBLCutDcosb8UJ/DY8Xghlv2zf8qw psCg0NU5/wT6aLOjFzdPsqPimNy5jREsB8LCtbEUGArtITPTuYnyiJvq1ga9KROiJRbG mU5ujF6dteWe5kR+frPKcLAu3RFRwdnqdFv52tvd+8DQnlaX8kQXhZhCtyVWzDTCdkq4 wciw== X-Gm-Message-State: ACgBeo2POCw9lucgFum1IKcmGphozexE/wOdMeOFpAP/uoKcdgNgciWw 0LkgxXZVh9rxeL4jqkFkEkmsiPzZ3so= X-Google-Smtp-Source: AA6agR7diDymzbq2G68+mWq3Lvc6HGGKCvrDd/8LzkIi42v4ywsAulBhrUOfN+7r9ZDHAVhpeGASXQ== X-Received: by 2002:a05:6402:254b:b0:451:2b1d:d82c with SMTP id l11-20020a056402254b00b004512b1dd82cmr8013158edb.343.1662893144040; Sun, 11 Sep 2022 03:45:44 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id e7-20020a170906314700b007708130c287sm2840318eje.40.2022.09.11.03.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:45:43 -0700 (PDT) Date: Sun, 11 Sep 2022 12:45:42 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] staging: vt6655: Cleanup and rename function MACvSaveContext 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 function MACvSaveContext to vt6655_mac_save_context to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Change declaration of cxt_buf to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 6 +++--- drivers/staging/vt6655/mac.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 567bc38ecfa9..092b1fffcfa1 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -14,7 +14,7 @@ * vt6655_mac_set_short_retry_limit - Set 802.11 Short Retry limit * MACvSetLongRetryLimit - Set 802.11 Long Retry limit * vt6655_mac_set_loopback_mode - Set MAC Loopback Mode - * MACvSaveContext - Save Context of MAC Registers + * vt6655_mac_save_context - Save Context of MAC Registers * MACvRestoreContext - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC * MACbSafeRxOff - Turn Off MAC Rx @@ -181,7 +181,7 @@ static void vt6655_mac_set_loopback_mode(struct vnt_pri= vate *priv, u8 loopback_m * Return Value: none * */ -void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf) +static void vt6655_mac_save_context(struct vnt_private *priv, u8 *cxt_buf) { void __iomem *io_base =3D priv->port_offset; =20 @@ -303,7 +303,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv) * reset, then restore register's value */ /* save MAC context */ - MACvSaveContext(priv, abyTmpRegData); + vt6655_mac_save_context(priv, abyTmpRegData); /* do reset */ bRetVal =3D MACbSoftwareReset(priv); /* restore MAC context, except CR0 */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index f7d00a251677..1752905d7df0 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -553,7 +553,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re =20 void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 -void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf); void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf); =20 bool MACbSoftwareReset(struct vnt_private *priv); --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 6E821ECAAA1 for ; Sun, 11 Sep 2022 10:46:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbiIKKqV (ORCPT ); Sun, 11 Sep 2022 06:46:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbiIKKp6 (ORCPT ); Sun, 11 Sep 2022 06:45:58 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C41EF27FEE for ; Sun, 11 Sep 2022 03:45:57 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id z14-20020a7bc7ce000000b003a5db0388a8so1086129wmk.1 for ; Sun, 11 Sep 2022 03:45:57 -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:subject:date; bh=SX58nvHa5MmAWCyfWE/eOeXOe3udXQO3AxsT+e0r78A=; b=Bh6oav9fyTcnDsQlNO5fxtvtQdNeLsWxHgzF6LtGi63CzykttX+KDK2e4H4VjYPPRt rw2hr/IgjV78oSb5L+CFXiDE3spEA1Bw40lfRA07/Fx5MyBJVcOoY/3XTst9Hr6sgbq4 0BkvICNJXys+jYlZvhJDcQi4I6/dlv4ma+ZFowqbpZxbaxbcFfFvtx5UJmh5+g5ZLe7V 4uPOkCYuBdYpWmsvb6r8IuNIe8QMMnVCO2LRSM5+igsoR2WeCLxJunMkIWtD4M1g4XoL ecwqxQ86Ame6Hc2FtgdqUVkg+fPFhEQfCgdjk94e0LYQ6P9zN2Yy9D3jEJDCIpbctMhi 6ueQ== 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:subject:date; bh=SX58nvHa5MmAWCyfWE/eOeXOe3udXQO3AxsT+e0r78A=; b=R3/djD+MaHuVqbDHBqACfN4bv08uMHMcbqwgdocxhNoJE4AYh0z/DTN3V/6PNy7saD souLLujpO5MYgplDPjpKsOKzdv8ASRhAN/0sU51XAnp83qOq3VngHDJ0tPFks7SIiMIg CNMscMg38GTH1AzGFeH7QtWhyoAPYtF8wMzUU/JuN9cOwu8VCrYzNF+GwTQKm2CZaBvG 9I1binPvKNLoF7ZPJeIB/C6SCETV6bK2JWxCV3QZCXCaDd9wIRW+grX/xqqrmzd022S/ ZwCspzKQEppbQPWyx1+SoF9PvFJ6GKmjjNPI889cvK3tpREBruBnJtLm0vAM62ftRX04 WgmA== X-Gm-Message-State: ACgBeo31v9EDE0WCysQqzZWhgwaCdVDuNP7C1KMHJOk7nqkzl8WDmoC6 HagqBZ6HIxaQLb0jGvuOj9A= X-Google-Smtp-Source: AA6agR75XWQpI3Gher5EAOaqqS02uNIJRaFlFnwVdDzDVSGryK9IwIBdgffwOrn1TNkIp8fpHzJEXQ== X-Received: by 2002:a05:600c:1c84:b0:3b3:ef37:afd3 with SMTP id k4-20020a05600c1c8400b003b3ef37afd3mr6954238wms.155.1662893155699; Sun, 11 Sep 2022 03:45:55 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id q127-20020a1c4385000000b003a5f54e3bbbsm6325332wma.38.2022.09.11.03.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:45:55 -0700 (PDT) Date: Sun, 11 Sep 2022 12:45:53 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/12] staging: vt6655: Cleanup and rename function MACvRestoreContext Message-ID: <3d215bbf1675fd093c9b31fbf3b29ce09432ab27.1662890990.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 function MACvRestoreContext to vt6655_mac_restore_context to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Change declaration of cxt_buf to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 6 +++--- drivers/staging/vt6655/mac.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 092b1fffcfa1..b1aa5fbe4430 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -15,7 +15,7 @@ * MACvSetLongRetryLimit - Set 802.11 Long Retry limit * vt6655_mac_set_loopback_mode - Set MAC Loopback Mode * vt6655_mac_save_context - Save Context of MAC Registers - * MACvRestoreContext - Restore Context of MAC Registers + * vt6655_mac_restore_context - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC * MACbSafeRxOff - Turn Off MAC Rx * MACbSafeTxOff - Turn Off MAC Tx @@ -211,7 +211,7 @@ static void vt6655_mac_save_context(struct vnt_private = *priv, u8 *cxt_buf) * Return Value: none * */ -void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) +static void vt6655_mac_restore_context(struct vnt_private *priv, u8 *cxt_b= uf) { void __iomem *io_base =3D priv->port_offset; =20 @@ -307,7 +307,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv) /* do reset */ bRetVal =3D MACbSoftwareReset(priv); /* restore MAC context, except CR0 */ - MACvRestoreContext(priv, abyTmpRegData); + vt6655_mac_restore_context(priv, abyTmpRegData); =20 return bRetVal; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 1752905d7df0..25247b0bf039 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -553,8 +553,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re =20 void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 -void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf); - bool MACbSoftwareReset(struct vnt_private *priv); bool MACbSafeSoftwareReset(struct vnt_private *priv); bool MACbSafeRxOff(struct vnt_private *priv); --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 F0770ECAAA1 for ; Sun, 11 Sep 2022 10:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230238AbiIKKq1 (ORCPT ); Sun, 11 Sep 2022 06:46:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230268AbiIKKqK (ORCPT ); Sun, 11 Sep 2022 06:46:10 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F40C826128 for ; Sun, 11 Sep 2022 03:46:07 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id o25so10882920wrf.9 for ; Sun, 11 Sep 2022 03:46:07 -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:subject:date; bh=gp3UgaatVvujanlcL6wYXQCbjciFqKB9PuAksoUMUQ4=; b=qhKxEiK3HRYyBRAy3vY3BcKyHfU77EAYHoMRZG9LlIH/U9XRRKbxPeCeSplBw/Yr1R dkmjbztA6a4m56WoWNJsgdXplWvP4mQ7/uU5U2Go2m1muINB2bIwZxe1Q+y3ReYa6BYn aPnFLJ6l3BPra8/R/RCB+vE5x65JKNGLfyFH2ac75Q/M4503NVb5/ty+iK7WJQZ6quCc 8FzUkEQIMnHpThS6Pcx6fiN188/+jiEPlaHbqdN/ifDf7kQIfS3pEnuJyX75OJXggsmL CJg9zVO6PXf7OxgiO3VJ7LOEI6MmBgwVqPYo1ES9oBCLhfDTdNwtX4zMyt/29CWN7Ym1 wjYQ== 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:subject:date; bh=gp3UgaatVvujanlcL6wYXQCbjciFqKB9PuAksoUMUQ4=; b=QkkSZMTfkjvvyBTOndjxmRS/5+xoKIQNPvIBCWbtKLE2WVefFlBUI4l/a8T43N0JgY fH2C62eZNSeqS8fx9HA2rIKnQWbir+4W7YN/eUsrqyHmcIYCgSdpmuLhvZOQUE8yWHdc U8Mw5sRVOWAykXGUfjV563h57krwAFxB/ZJYtVie2QdS0a7HAuM6snTNnuSBTWQQvbQ1 /zSQkfP5V6g3hCqZtsGml57sTcDvxqrXEn9zf/FerKFAO+gkF7v/ORFTpL++YSzoVEmO f1i6WXo5bmi7q13ITiCgkU9bHmDGBMg0eTmB206Pk9wzg89KNf2Fgx1bZUMptTA5GlHh ihqA== X-Gm-Message-State: ACgBeo2UzrIdJ9JeuS0CBE4lOEWM0pLU/kZx8r1ywwr0LG8JClE628b7 knMYlBo7jaH3bouqOSD1cUm8SOWzi70= X-Google-Smtp-Source: AA6agR6S7tlDjdVGdhfl64fTLOzpj7KguvH0z1mvzqdZ0VEQpdSyaJDBt6/PTK/rdEjchIyo4jq0Mg== X-Received: by 2002:a5d:6da7:0:b0:226:e081:941a with SMTP id u7-20020a5d6da7000000b00226e081941amr12121197wrs.642.1662893166500; Sun, 11 Sep 2022 03:46:06 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id l5-20020a05600c1d0500b003b477532e66sm3478029wms.2.2022.09.11.03.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:06 -0700 (PDT) Date: Sun, 11 Sep 2022 12:46:04 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] staging: vt6655: Cleanup and rename function MACbSafeSoftwareReset Message-ID: <540a684266610f7618b3ef6000d4699d065c8e6f.1662890990.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 function MACbSafeSoftwareReset to vt6655_mac_save_soft_reset and abyTmpRegData to tmp_reg_data to avoid CamelCase which is not accepted by checkpatch.pl. Remove return value bRetVal as it is unused by the calling functions. Remove unnecessary declaration of function and make function static. Change declaration of tmp_reg_data to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 17 +++++++---------- drivers/staging/vt6655/mac.h | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index b1aa5fbe4430..f292a34c23dd 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -293,23 +293,20 @@ bool MACbSoftwareReset(struct vnt_private *priv) * Return Value: true if success; otherwise false * */ -bool MACbSafeSoftwareReset(struct vnt_private *priv) +static void vt6655_mac_save_soft_reset(struct vnt_private *priv) { - unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0 + MAC_MAX_CONTEXT_= SIZE_PAGE1]; - bool bRetVal; + u8 tmp_reg_data[MAC_MAX_CONTEXT_SIZE_PAGE0 + MAC_MAX_CONTEXT_SIZE_PAGE1]; =20 /* PATCH.... * save some important register's value, then do * reset, then restore register's value */ /* save MAC context */ - vt6655_mac_save_context(priv, abyTmpRegData); + vt6655_mac_save_context(priv, tmp_reg_data); /* do reset */ - bRetVal =3D MACbSoftwareReset(priv); + MACbSoftwareReset(priv); /* restore MAC context, except CR0 */ - vt6655_mac_restore_context(priv, abyTmpRegData); - - return bRetVal; + vt6655_mac_restore_context(priv, tmp_reg_data); } =20 /* @@ -443,12 +440,12 @@ bool MACbSafeStop(struct vnt_private *priv) =20 if (!MACbSafeRxOff(priv)) { pr_debug(" MACbSafeRxOff =3D=3D false)\n"); - MACbSafeSoftwareReset(priv); + vt6655_mac_save_soft_reset(priv); return false; } if (!MACbSafeTxOff(priv)) { pr_debug(" MACbSafeTxOff =3D=3D false)\n"); - MACbSafeSoftwareReset(priv); + vt6655_mac_save_soft_reset(priv); return false; } =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 25247b0bf039..5dd8644749ec 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -554,7 +554,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 bool MACbSoftwareReset(struct vnt_private *priv); -bool MACbSafeSoftwareReset(struct vnt_private *priv); bool MACbSafeRxOff(struct vnt_private *priv); bool MACbSafeTxOff(struct vnt_private *priv); bool MACbSafeStop(struct vnt_private *priv); --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 02417ECAAA1 for ; Sun, 11 Sep 2022 10:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230250AbiIKKq3 (ORCPT ); Sun, 11 Sep 2022 06:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbiIKKqU (ORCPT ); Sun, 11 Sep 2022 06:46:20 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F504AE48 for ; Sun, 11 Sep 2022 03:46:19 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id c11so10851668wrp.11 for ; Sun, 11 Sep 2022 03:46:19 -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:subject:date; bh=0hkQhpo1A1tdXsj7hM3SgBaWaZ2bYD8tzutyzKnpV6Y=; b=QuTOkaDTihOMWagUS0w0B0LiJt93fzUdDTfNECCTJkZ8NI4HZgUlHrE+gAtMMCwmsY ziLJFr8XrHqwGm3YDsov6q4m1/vVk3lH6cJVBwrV0pjFV1DeZxRPjcmxNT++dIqJuNwg gS4RnuU8vrtUzmGcKCiqsmITAAK/4K/2LSj887r9uAm4i9iN154G2YRrD/wTWhrF5+q1 XOyLhEIjWqdZ8T/3ZTyE78bBBv3kWUTuHRnGjlfFK73ehCqO4fju/jUATyX8kvea8aHx wSu1XFYa9VH8lBdL8nBsW82JOqdafmDb8Vdp5BDSbdBstJNjDYZqgRINkiD7C/FYE0ZM 2qUg== 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:subject:date; bh=0hkQhpo1A1tdXsj7hM3SgBaWaZ2bYD8tzutyzKnpV6Y=; b=r5Cf+7gKu9iIQYgGT9g3OnmpIn4mvBPYovIRFdeo2/zzYReUJCpr3Wtyi17QAhg9Ow Jy4Rtq9ujh14UW2MqWsBnUmQMGInmmKW8TsiTfgFv1p+TC3GSJUPbfRf9aTXHipwUX49 SIhgKsvO0/AMU5xYGMNijdnoEDmy9pTKiROgO8JyaE+25Nv4iYRQQU0t9Q5vta3SpfPh 0sjuS3Hea68ef5wMdO/JxnHmScmoDxDzB8zD5AmN4O/OV/jTIcz5zSu6eRSOB5nbigeN q25PVD/rr18nGUyaxOg52xzoMm93EN17vqSRj/+OwS99w0P0deOUuks08OLhuqnFnJyx C1pw== X-Gm-Message-State: ACgBeo30lr+CSANVD8HVfdCpdk8raaK65FX/0oXNI2bze4thzqqPFHa7 OrbbC0zxDHoazj3ouaUP2pk= X-Google-Smtp-Source: AA6agR4BPOftbJEfLk/OZLQ9U9wjvjFHpsv5VVUyjn1M1zZ2qDnyf22vqvea0eqz9a6M+WLoZVap3A== X-Received: by 2002:a5d:6d4f:0:b0:225:63aa:27b2 with SMTP id k15-20020a5d6d4f000000b0022563aa27b2mr12737022wri.599.1662893177794; Sun, 11 Sep 2022 03:46:17 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id o22-20020a05600c511600b003a5b6086381sm6263484wms.48.2022.09.11.03.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:17 -0700 (PDT) Date: Sun, 11 Sep 2022 12:46:15 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/12] staging: vt6655: Rename function MACbSafeRxOff Message-ID: <0cbcc7205e943393e2873839116d5ffcfb9d3d00.1662890990.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 function MACbSafeRxOff to vt6655_mac_safe_rx_off to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 8 ++++---- drivers/staging/vt6655/mac.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index f292a34c23dd..e0216d320235 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -17,7 +17,7 @@ * vt6655_mac_save_context - Save Context of MAC Registers * vt6655_mac_restore_context - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC - * MACbSafeRxOff - Turn Off MAC Rx + * vt6655_mac_safe_rx_off - Turn Off MAC Rx * MACbSafeTxOff - Turn Off MAC Tx * MACbSafeStop - Stop MAC function * MACbShutdown - Shut down MAC @@ -322,7 +322,7 @@ static void vt6655_mac_save_soft_reset(struct vnt_priva= te *priv) * Return Value: true if success; otherwise false * */ -bool MACbSafeRxOff(struct vnt_private *priv) +static bool vt6655_mac_safe_rx_off(struct vnt_private *priv) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; @@ -438,8 +438,8 @@ bool MACbSafeStop(struct vnt_private *priv) =20 vt6655_mac_reg_bits_off(io_base, MAC_REG_TCR, TCR_AUTOBCNTX); =20 - if (!MACbSafeRxOff(priv)) { - pr_debug(" MACbSafeRxOff =3D=3D false)\n"); + if (!vt6655_mac_safe_rx_off(priv)) { + pr_debug(" vt6655_mac_safe_rx_off =3D=3D false)\n"); vt6655_mac_save_soft_reset(priv); return false; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 5dd8644749ec..e6ff860c1bfa 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -554,7 +554,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 bool MACbSoftwareReset(struct vnt_private *priv); -bool MACbSafeRxOff(struct vnt_private *priv); bool MACbSafeTxOff(struct vnt_private *priv); bool MACbSafeStop(struct vnt_private *priv); bool MACbShutdown(struct vnt_private *priv); --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 45505ECAAA1 for ; Sun, 11 Sep 2022 10:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230310AbiIKKqr (ORCPT ); Sun, 11 Sep 2022 06:46:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbiIKKq3 (ORCPT ); Sun, 11 Sep 2022 06:46:29 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77E1B2B191 for ; Sun, 11 Sep 2022 03:46:27 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id t14so10892732wrx.8 for ; Sun, 11 Sep 2022 03:46:27 -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:subject:date; bh=HkRQXD8heGTebUpGA++qzsjiZZghTy1mCCFzSRDXdig=; b=WYPJuHp1aGBbMeZbq/Lfgta/tRfmmVoikgKDHaLzGrSNx8mG4JLQlANVjyhn2Ifcii IOfyustG56sQ51RMk51Xe0SMz92qDkgy7NVqmrcTZuv2/W2W7XoWqc5SPt/CrWkV6lmc Zd0mf86u0Gq2y0ZaoBNIJsAJXUSsP3PGcvdaVJFEDwWsVkqAEn976paNHgZwCpLmZvGk R1yHLg2V/bDQBUv/ioiCIaNwys4i6xyAMJ3ADc01dNCf2pbr7v/F963GTZVvFQNcb7ox 7h5Zr4C9keDvZBLmsMgevB/SVZKRTzl18IIbalaBAbYvB9RrhVM+yWHVO3zmjRwm8Ea+ 268Q== 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:subject:date; bh=HkRQXD8heGTebUpGA++qzsjiZZghTy1mCCFzSRDXdig=; b=WKAdlSzhmSOE0xlTsM/GyPcyjim9FaRty1sjneTja2ctGR3HJC+760JnATsCCAiHP5 58AwltcozxjfxfoVV71RjtogIyEvqlMsWZE81HURvFV87Muxx7bYr0+mGTth2fOT+E/k fhu3u/jfOAM+lHIQ6WGmtaEtKJOf0tJtJLlEtV+haYEsH7VZcqMsfb+tiDdUKHdT52mT C1UBBnH4it7W7vJgOxg9K9u1/rUvo5/Bzar/CFttYPDWoxMEbXKiA+SptM5O+/eluIiG V0S07l/+Qjj073IOlYyNvK0lwhCt+bOqrFmfJLisxXEl4yZI7o+p6zfbbS8nMCXiGRfT 1Lcg== X-Gm-Message-State: ACgBeo3cXh3LZoeLPfQYwfSX3DMXzm0LQEklgcVCjbkpObatZxrbA0Ti zCDrAtlfB1FJ3jP6z/KxTmAmEJSdewY= X-Google-Smtp-Source: AA6agR669Jcnw8mlp+34lVaPiR8YUjeEvxn8gntiKWs+uLTYRlZppFLL0LDnT5UzroM3Lehu1xP/cQ== X-Received: by 2002:adf:e649:0:b0:228:a8f6:42b4 with SMTP id b9-20020adfe649000000b00228a8f642b4mr12240264wrn.167.1662893185777; Sun, 11 Sep 2022 03:46:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id j13-20020adff54d000000b00229d55994e0sm4579677wrp.59.2022.09.11.03.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:25 -0700 (PDT) Date: Sun, 11 Sep 2022 12:46:23 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/12] staging: vt6655: Rename function MACbSafeTxOff Message-ID: <50211bbdd866be93fe9ea912a433e56460bf7f28.1662890990.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 function MACbSafeTxOff to vt6655_mac_safe_tx_off to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 8 ++++---- drivers/staging/vt6655/mac.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index e0216d320235..24851fe53683 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -18,7 +18,7 @@ * vt6655_mac_restore_context - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC * vt6655_mac_safe_rx_off - Turn Off MAC Rx - * MACbSafeTxOff - Turn Off MAC Tx + * vt6655_mac_safe_tx_off - Turn Off MAC Tx * MACbSafeStop - Stop MAC function * MACbShutdown - Shut down MAC * MACvInitialize - Initialize MAC @@ -376,7 +376,7 @@ static bool vt6655_mac_safe_rx_off(struct vnt_private *= priv) * Return Value: true if success; otherwise false * */ -bool MACbSafeTxOff(struct vnt_private *priv) +static bool vt6655_mac_safe_tx_off(struct vnt_private *priv) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; @@ -443,8 +443,8 @@ bool MACbSafeStop(struct vnt_private *priv) vt6655_mac_save_soft_reset(priv); return false; } - if (!MACbSafeTxOff(priv)) { - pr_debug(" MACbSafeTxOff =3D=3D false)\n"); + if (!vt6655_mac_safe_tx_off(priv)) { + pr_debug(" vt6655_mac_safe_tx_off =3D=3D false)\n"); vt6655_mac_save_soft_reset(priv); return false; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index e6ff860c1bfa..12b4f8937d14 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -554,7 +554,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 bool MACbSoftwareReset(struct vnt_private *priv); -bool MACbSafeTxOff(struct vnt_private *priv); bool MACbSafeStop(struct vnt_private *priv); bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 E577FC6FA83 for ; Sun, 11 Sep 2022 10:47:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbiIKKrH (ORCPT ); Sun, 11 Sep 2022 06:47:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230320AbiIKKqt (ORCPT ); Sun, 11 Sep 2022 06:46:49 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC3433C8DA for ; Sun, 11 Sep 2022 03:46:39 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id bz13so10908077wrb.2 for ; Sun, 11 Sep 2022 03:46:39 -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:subject:date; bh=tt9NMRyw8MMy/Ms0k1vJAa4N/O0yRMe4kg49/O6Uyrk=; b=jqWNhxJtKn0Fa20uPv8Z+cGWTHh7J9ViS9ZNsWNOpg5ppGYQHG9xMELvpCwd4MXf8w 3VFOFuK4d+Vs44exVnuv0+0CFBSB7TrxuNK4OsYJvZVbYoCNMfQ6+2yRZP97MFxx8V5P VraY4AnO4TuTKFknV5Z+OoRhuMYqyqkwaUoOyFBQT4g64LtMxoBmrKuVlipac/LMddK+ OPGcKB3+VMIZ66PzlY8LiuZR2rX0n2wLCuT03OI59c5vAkZNL0k1DnrVEqVxTM/HK0JS JXwClV8uHAtGmsThZ/Gkzub5HlpW+lCPHBQmK+b8yRq6PMymtgdQi40yM2L92Tx/Ja3C rIgg== 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:subject:date; bh=tt9NMRyw8MMy/Ms0k1vJAa4N/O0yRMe4kg49/O6Uyrk=; b=oCqht6sbmbJs76pFGfIj+wmuITP4D0mIw3IULutphEhOab8KbHsLSrjceN2Ep1TAeS 4h70P7YoVPTPb46nEOJQuR7Wn7y8QIBCCeuYo3kaSsm4jZDk9KTq+lO479eSVeEsdHlP CP8/rEAajwe5Nx1nbi9+FQZbS/3pY0kz/+QE25n0eVcX+969sKuOaQ25tdYcFwWpulkR DxJuUv51qWzcVamIoXyznOeD8h1UDgqv8yhRZKK3sfp8U2qEXhjbHNKf1AvNrnT1cZ+I N0eNkoDVXDhlauWIkXLFrm9rBXgscEIvwfKkvoU52X8KolfHT8/APYWawF5FIObnwnid OekA== X-Gm-Message-State: ACgBeo2OzyQzBouHRJrZYnPpAjYLt1/72U1PrOarrw0GdJj92t6X2gMA ic4kjZG9xtvVFVMcWuVxok8= X-Google-Smtp-Source: AA6agR7iDrtIh98z5LkgQYMMMSANdsEYPawSJdwyt+Gld+aVWp8alfCxw29OjzuwPg+3LMXJbr1/zg== X-Received: by 2002:adf:a70b:0:b0:226:e1f5:7889 with SMTP id c11-20020adfa70b000000b00226e1f57889mr11985588wrd.108.1662893197732; Sun, 11 Sep 2022 03:46:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id m35-20020a05600c3b2300b003a845fa1edfsm8287707wms.3.2022.09.11.03.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:37 -0700 (PDT) Date: Sun, 11 Sep 2022 12:46:35 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/12] staging: vt6655: Rename function MACbSafeStop Message-ID: <5c91b281dfab75e5ccf13413232ec993a8056af8.1662890990.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 function MACbSafeStop to vt6655_mac_safe_stop to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 6 +++--- drivers/staging/vt6655/mac.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 24851fe53683..e1f639787316 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -19,7 +19,7 @@ * MACbSoftwareReset - Software Reset MAC * vt6655_mac_safe_rx_off - Turn Off MAC Rx * vt6655_mac_safe_tx_off - Turn Off MAC Tx - * MACbSafeStop - Stop MAC function + * vt6655_mac_safe_stop - Stop MAC function * MACbShutdown - Shut down MAC * MACvInitialize - Initialize MAC * MACvSetCurrRxDescAddr - Set Rx Descriptors Address @@ -432,7 +432,7 @@ static bool vt6655_mac_safe_tx_off(struct vnt_private *= priv) * Return Value: true if success; otherwise false * */ -bool MACbSafeStop(struct vnt_private *priv) +static bool vt6655_mac_safe_stop(struct vnt_private *priv) { void __iomem *io_base =3D priv->port_offset; =20 @@ -474,7 +474,7 @@ bool MACbShutdown(struct vnt_private *priv) iowrite32(0, io_base + MAC_REG_IMR); vt6655_mac_set_loopback_mode(priv, MAC_LB_INTERNAL); /* stop the adapter */ - if (!MACbSafeStop(priv)) { + if (!vt6655_mac_safe_stop(priv)) { vt6655_mac_set_loopback_mode(priv, MAC_LB_NONE); return false; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 12b4f8937d14..c6147a4f563e 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -554,7 +554,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_privat= e *priv, unsigned char re void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetry= Limit); =20 bool MACbSoftwareReset(struct vnt_private *priv); -bool MACbSafeStop(struct vnt_private *priv); bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); void MACvSetCurrRx0DescAddr(struct vnt_private *priv, --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 E5C59C6FA83 for ; Sun, 11 Sep 2022 10:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbiIKKr1 (ORCPT ); Sun, 11 Sep 2022 06:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230313AbiIKKrC (ORCPT ); Sun, 11 Sep 2022 06:47:02 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 983A63C16C for ; Sun, 11 Sep 2022 03:47:00 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id e16so10894453wrx.7 for ; Sun, 11 Sep 2022 03:47: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:subject:date; bh=nBdTSAzFShT30tVGtuaAt4w0WQVoDwWLtAj/D+fJEoQ=; b=Dp1BsHfW8cgZ2B+XxymWNyqAIO33+m3Ciz/srTGiMLnWBE2zrDnEMD71oIpt9fXmLW N9w/98zvBxDxAjqo90+qCw1Yalh3U1uJGITetUy3oPTK2zNcxUOrM1VeZqG3PCeFSjba Eohm3mwKx0NVPiLRZroHYWuTwRsMpXeb6pxVkT0usNQH/39pwOsBGRCCAeXHXCxJ24H1 ESZUVQS7P00l6/qIH8mdc6BbHl3QtwHGN93MVrIKG2WTIsgEMegwEF946642oJ6mOOmS VJkDdMsi38iuMI727tBAhk6PHK6tHO1Yp2w+HSozZ28NDfVOqHInnZxzJkhtbBAdJJoJ O8dw== 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:subject:date; bh=nBdTSAzFShT30tVGtuaAt4w0WQVoDwWLtAj/D+fJEoQ=; b=Vqmnh7zqg5E6j4ggm069R5d9KnQvC/oCmeG1FC2Rd2yKuU/9nQQLtQ1r8TcbhVwIGP G7pzNoYW47pGMKZY38PwiWtd8t5LjwREtccxC0+hYSGeNklZFngllzBSVs/JRe5QRmua +NhT+LAcISELGVSuiD+21AszOWCxvt6RnvJQjnBsvsGyXyXukocvD4uBTiVy7Me3TR2f CwkOi/f8B3BfgnI1CwHe45AmqNsId+62mCXYqp9Rga96j2SXL+6Qub1YbRVqgLQ4EDyy aCpOroXpKJhvYjvnlSNuGiy6D2HoU4ADb+W8CzWlRf1ZJtCLq8DT+6siWh0W+SkZh7yE +0Yg== X-Gm-Message-State: ACgBeo2x1xwAgpC/PdjzYQ1DJtjz+p5L3r7bn6L9iknB1jQV594ifnOa Puw+TJITG7wzSzSGQLCndFM= X-Google-Smtp-Source: AA6agR4vUjvoBaO8sfin/zparxquhaBoIOhA2IGrIbQpvw0CO05HlwQ8pkB6XNsmxmW+XIe1aKrHjA== X-Received: by 2002:a5d:6102:0:b0:228:811f:b496 with SMTP id v2-20020a5d6102000000b00228811fb496mr12649619wrt.404.1662893219120; Sun, 11 Sep 2022 03:46:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id p8-20020a1c5448000000b003a502c23f2asm6220317wmi.16.2022.09.11.03.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:46:58 -0700 (PDT) Date: Sun, 11 Sep 2022 12:46:57 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] staging: vt6655: Rename function MACvSetCurrRx0DescAddr Message-ID: <14f7f2b06ba9f8656d91d4cb84c363e190095049.1662890990.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 function MACvSetCurrRx0DescAddr to vt6655_mac_set_curr_rx_0_desc... to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.c | 2 +- drivers/staging/vt6655/mac.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 1b2ba6793ead..dc39b3668c77 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -458,7 +458,7 @@ void CARDvSafeResetRx(struct vnt_private *priv) iowrite32(RX_PERPKT, priv->port_offset + MAC_REG_RXDMACTL0); iowrite32(RX_PERPKT, priv->port_offset + MAC_REG_RXDMACTL1); /* set MAC RD pointer */ - MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); + vt6655_mac_set_curr_rx_0_desc_addr(priv, priv->rd0_pool_dma); =20 MACvSetCurrRx1DescAddr(priv, priv->rd1_pool_dma); } diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index e1f639787316..e88536705d23 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -527,7 +527,7 @@ void MACvInitialize(struct vnt_private *priv) * Return Value: none * */ -void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) +void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index c6147a4f563e..b092e59a5b98 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -556,8 +556,7 @@ void MACvSetLongRetryLimit(struct vnt_private *priv, un= signed char byRetryLimit) bool MACbSoftwareReset(struct vnt_private *priv); bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); -void MACvSetCurrRx0DescAddr(struct vnt_private *priv, - u32 curr_desc_addr); +void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 92994C6FA83 for ; Sun, 11 Sep 2022 10:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbiIKKri (ORCPT ); Sun, 11 Sep 2022 06:47:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbiIKKrO (ORCPT ); Sun, 11 Sep 2022 06:47:14 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 891FB3C8DD for ; Sun, 11 Sep 2022 03:47:11 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id e20so10859093wri.13 for ; Sun, 11 Sep 2022 03:47: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:subject:date; bh=TT6OYj05Y/OPaIfMBcxSP+HaQFVzI0H6ci3zEsCyTH0=; b=VPuwS/1KbQj6bIjLdGNTfU5UDPGo6ceRfJnMYfBnITrtE7a1M5nBuOJtwAgQCTcXsl r9XjgpLmLlzTKBAvqCKW7TFzvvHhiZ5me9UQUyucu/XHKwhFo6suLw/kk1nGeLJYyL8z dDGxuyXKs4Ql4YX+oMe2dm/9IesjE3yEYgISfikNOqkehWEOK+bDf1pRHDm1zi9CE/PK N/SYG48Xl/08fiS4TahJ94ZWogJK79rWXFRgr9mYjP/QNibBJGHi2/S2FYYeEHc8OfhU KQXzTaiioS6QnlPPEb7Uv+cBCv0LlCswUeWUbn/c3D41QEwEMHDaAPTtH2hYz1hkp0EB 9UxA== 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:subject:date; bh=TT6OYj05Y/OPaIfMBcxSP+HaQFVzI0H6ci3zEsCyTH0=; b=SaBwdu2uJoyPiHlZ8OFjBaHHiSWivuI+f/4ArM7CLEQOm6PWJHCWzIKE/ZLW+UP4Ao Vn4xSNgHFIAElu8Ez867QimaKZq4UcCZMkdIFFXp+kcc5LgtPYJZCpfFUCnaNiYCxWTV MG/uxBstSlJBVBIKEydSw19Apu6PSMbS5cOhzT5SF2P4XK2pq+dJFO9CZbRWep27fZ02 TkIzx3roUnUcOiJYMaHSeUFYvHnyjHLkkoAtCj8G5rDqCCIABftB1TWPbBLC9ueqIBAy X0tdNrV/D++l9WgZNzjGghCsGqZ4TNjWk8a/WdPVnBjajDRrSVVRMH01iMnWoTlePWEg qStw== X-Gm-Message-State: ACgBeo15z0jdiHDQIKBoz7lMK0kr/cnq5gBpi51SpDH5e26r8fkjGYks QAjZaPAkOj5QRc6Su/mGoU8= X-Google-Smtp-Source: AA6agR6nL4INVoqEtyPqMDS+sGUJpypmgQ3Dce+GdrMZK0OzHGD8kKftBHDaZMa472Xgyc2xMcHv5A== X-Received: by 2002:a5d:68c6:0:b0:228:74b6:2b07 with SMTP id p6-20020a5d68c6000000b0022874b62b07mr12073406wrw.60.1662893229758; Sun, 11 Sep 2022 03:47:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id 11-20020a05600c020b00b003b4868eb6bbsm112872wmi.23.2022.09.11.03.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:47:09 -0700 (PDT) Date: Sun, 11 Sep 2022 12:47:07 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/12] staging: vt6655: Rename function MACvSetCurrRx1DescAddr Message-ID: <0d11f588d4746988478521d323ab49e6a0b7f8b0.1662890990.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 function MACvSetCurrRx1DescAddr to vt6655_mac_set_curr_rx_1_desc... to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.c | 2 +- drivers/staging/vt6655/mac.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index dc39b3668c77..d137b4b45e3b 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -460,7 +460,7 @@ void CARDvSafeResetRx(struct vnt_private *priv) /* set MAC RD pointer */ vt6655_mac_set_curr_rx_0_desc_addr(priv, priv->rd0_pool_dma); =20 - MACvSetCurrRx1DescAddr(priv, priv->rd1_pool_dma); + vt6655_mac_set_curr_rx_1_desc_addr(priv, priv->rd1_pool_dma); } =20 /* diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index e88536705d23..d6614be79e39 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -561,7 +561,7 @@ void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_priv= ate *priv, u32 curr_desc_ * Return Value: none * */ -void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) +void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b092e59a5b98..fff9dc72e2c0 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -557,8 +557,7 @@ bool MACbSoftwareReset(struct vnt_private *priv); bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); -void MACvSetCurrRx1DescAddr(struct vnt_private *priv, - u32 curr_desc_addr); +void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 68D4DC6FA83 for ; Sun, 11 Sep 2022 10:47:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230282AbiIKKrv (ORCPT ); Sun, 11 Sep 2022 06:47:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbiIKKrX (ORCPT ); Sun, 11 Sep 2022 06:47:23 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFAE42A969 for ; Sun, 11 Sep 2022 03:47:18 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id bq9so10912753wrb.4 for ; Sun, 11 Sep 2022 03:47:18 -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:subject:date; bh=USDvEaR9KG1B871wiabGAqJETGBO4KGWzVY0Nv0OlAs=; b=VXfEAyS9YcF1cQyuWRGAF1k9gOEzkVnrNBm5zjTVCc+OuDCUNXR6poIRx/VRr656ZO Hm/5JFPO5Zk5AobQV3FNYdQW1baSsXB2Hwrt46MncIMfnGNVH+TpC16PNG6XCBApiRy4 hGMXpGH8AX4+WQu2r6/ZCyEOY3Ei4vjrf8yO6aUF5bU8KXgZnd9gIs2/ba2LF5sbONPM qLQACScQRNZ3PlwyZyJ4lymKrffM6LdoIRBcWppxXPhFv2DGCMG1zL1Fa1Aoed5YKJtv vzPSbMeA0kB8vVk0+0nHYl4aCRj1m9Lz5CVjQtzpk5njTZNX98PM+gEjerVZ469au0xU Y/Dw== 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:subject:date; bh=USDvEaR9KG1B871wiabGAqJETGBO4KGWzVY0Nv0OlAs=; b=1zZXjtzESctsSlQ7X0ZjsweiU01I4rkOf2jAjPzt7hsFWmVd7Ej9cRXMxR/epPdRpg R5gezo6RfHjxoin0i+muaQRhzsPZIYzqzmQpsn9fdUQchu1IxMUX30oV7I+XfMEODG5K cqQUBZOsHT6t2kSFx1ePDqcExfYyGfJxvUhX0JAsK57XRCxiEmipK3I3cU6XaEynhd8E R6m2ShfAyGLv2VlvcG1QUUqDVOqs+NLYKk8OLwPtih0LBAqnkj+J+vXRxmTC6jnete+V lYmPzqlw6SMZv/1tpsddvNsR0HYysiCgvJBr055UczE79wPgkDSmoQ4e7Ig3tjxNcIeS uVYg== X-Gm-Message-State: ACgBeo1HyvinN3Jr5gLZhS+JylkQQsM33yAanlNX3MtbWkm/q/T2VAVv 3u4iglhaXK3swKFvRuF1CZY= X-Google-Smtp-Source: AA6agR76dF0LX9ck6+79VD2KK1rv/tpH87XFaNfZbT9tOsETR7z5aXZElFSTFvS4H7MZNMn4x7HpLQ== X-Received: by 2002:adf:e781:0:b0:228:b44c:d0f7 with SMTP id n1-20020adfe781000000b00228b44cd0f7mr11589202wrm.243.1662893237576; Sun, 11 Sep 2022 03:47:17 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id r15-20020a5d694f000000b00228c792aaaasm4613391wrw.100.2022.09.11.03.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:47:17 -0700 (PDT) Date: Sun, 11 Sep 2022 12:47:15 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/12] staging: vt6655: Cleanup and rename function MACvSetCurrTXDescAddr Message-ID: <88dcbac76f6bad8b4eb68a3cb37cd4f9684294a0.1662890990.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 function MACvSetCurrTXDescAddr to vt6655_mac_set_curr_tx_desc_addr and iTxType to tx_type to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 4 ++-- drivers/staging/vt6655/mac.c | 7 +++---- drivers/staging/vt6655/mac.h | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index d137b4b45e3b..c680925b9c92 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -409,9 +409,9 @@ void CARDvSafeResetTx(struct vnt_private *priv) } =20 /* set MAC TD pointer */ - MACvSetCurrTXDescAddr(TYPE_TXDMA0, priv, priv->td0_pool_dma); + vt6655_mac_set_curr_tx_desc_addr(TYPE_TXDMA0, priv, priv->td0_pool_dma); =20 - MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); + vt6655_mac_set_curr_tx_desc_addr(TYPE_AC0DMA, priv, priv->td1_pool_dma); =20 /* set MAC Beacon TX pointer */ iowrite32((u32)priv->tx_beacon_dma, priv->port_offset + MAC_REG_BCNDMAPTR= ); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index d6614be79e39..0ff98468b2e0 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -653,12 +653,11 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *pri= v, iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL); } =20 -void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 curr_desc_addr) +void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *pri= v, u32 curr_desc_addr) { - if (iTxType =3D=3D TYPE_AC0DMA) + if (tx_type =3D=3D TYPE_AC0DMA) MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); - else if (iTxType =3D=3D TYPE_TXDMA0) + else if (tx_type =3D=3D TYPE_TXDMA0) MACvSetCurrTx0DescAddrEx(priv, curr_desc_addr); } =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index fff9dc72e2c0..0224f710d603 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -558,8 +558,7 @@ bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); -void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 curr_desc_addr); +void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *pri= v, u32 curr_desc_addr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 990B9C6FA83 for ; Sun, 11 Sep 2022 10:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230335AbiIKKr4 (ORCPT ); Sun, 11 Sep 2022 06:47:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230274AbiIKKr0 (ORCPT ); Sun, 11 Sep 2022 06:47:26 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A43CC220EA for ; Sun, 11 Sep 2022 03:47:25 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id bd26-20020a05600c1f1a00b003a5e82a6474so5131855wmb.4 for ; Sun, 11 Sep 2022 03:47:25 -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:subject:date; bh=IpM8ImahcxQnr43GKJ1vwFn3rPGdh1kfMTIgO7Z6QqE=; b=C7GgBhmkM6QeO0YtIxxIYCFAS9mJXK+ZKLXG5Fuptua8URwAL5c024PS8Ej/EwrKAU zHDsP3DEo0Xkbkr3f2AvFIKWqjBvEzJsRDIgrNKr1nIWA1krj1zZAF/BZXR9TpL6S2go Tk5XugGqcodDKYoIOCxsF7bKF1/PcuJ7mH+DR3WNMxukOs1gB3Wq4pX88f6IECoyFkZD DxGy0xIU7vpFg1cJlCiVksBBsKKrRAWLXLjSXfquRVNVMihpDBdD03DM8FArvAtxdDAA j7Ls9Vo0PT7JGhM6sitqWSmZmFNXDZRaHdIotIlP2X5Xtu9o44Ir4ELbbgEUPLiwhNiq 7c2Q== 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:subject:date; bh=IpM8ImahcxQnr43GKJ1vwFn3rPGdh1kfMTIgO7Z6QqE=; b=zUC6omajC5XTPhaMfEBeU6Y4mdJGwldij3pUDwO5WYQvwbza18pQDrheuIl2sjgI20 EJr21eokS3vwg97cOrhBeDuGx1SWTRuXC7V0QiWOWcOOwVebUmnuLkZjUhGhF8KgKwsy u6uMsKxVc0QyeHt4z/m0O+rU4KvWVzD9VSsa+M02uVkIBg6FqFslZ9C6uj+4mUSrycNT yCcEATZ8uclJxstQatbyLzINccj9ZeiWCyeooq+5lnjIdJn9Yu1Zojgz5+R/XUGubzKX U96+ctRnXVwaUJ16SDdGx2LnV5+EBOSGSt/aLSn7ULL0e8l4ekM+L359tHod0Zr6LLEc 0GXg== X-Gm-Message-State: ACgBeo3Zh9GPzVXvO09fXi5ckH8RlniIhyJakqoFy/Z7+mT64KmbQUoJ GRretSk5Pl4X6176nrXalCxaSZaGGGA= X-Google-Smtp-Source: AA6agR74Rprh1P1dW/+ozFcP79MAOARJjdumplSg2HpQoAXMmj5vmDfF6vo9RkCeRRRS8+HixDGjXw== X-Received: by 2002:a05:600c:1d1e:b0:3a5:4f8d:743f with SMTP id l30-20020a05600c1d1e00b003a54f8d743fmr10486222wms.121.1662893244059; Sun, 11 Sep 2022 03:47:24 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id 11-20020a05600c020b00b003b4868eb6bbsm113539wmi.23.2022.09.11.03.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:47:23 -0700 (PDT) Date: Sun, 11 Sep 2022 12:47:22 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] staging: vt6655: Rename function MACvSetCurrTx0DescAddrEx Message-ID: <4337deed83e1443ebf93c5591e17f5c6dfe0cf55.1662890990.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 function MACvSetCurrTx0DescAddrEx to vt6655_mac_set_curr_tx_0_... to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 5 ++--- drivers/staging/vt6655/mac.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 0ff98468b2e0..2fbee8508f0e 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -595,8 +595,7 @@ void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_priv= ate *priv, u32 curr_desc_ * Return Value: none * */ -void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, - u32 curr_desc_addr) +static void vt6655_mac_set_curr_tx_0_desc_addr_ex(struct vnt_private *priv= , u32 curr_desc_addr) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; @@ -658,7 +657,7 @@ void vt6655_mac_set_curr_tx_desc_addr(int tx_type, stru= ct vnt_private *priv, u32 if (tx_type =3D=3D TYPE_AC0DMA) MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); else if (tx_type =3D=3D TYPE_TXDMA0) - MACvSetCurrTx0DescAddrEx(priv, curr_desc_addr); + vt6655_mac_set_curr_tx_0_desc_addr_ex(priv, curr_desc_addr); } =20 /* diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 0224f710d603..3fbb891ac57c 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -559,8 +559,6 @@ void MACvInitialize(struct vnt_private *priv); void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *pri= v, u32 curr_desc_addr); -void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, - u32 curr_desc_addr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrSyncDescAddrEx(struct vnt_private *priv, --=20 2.37.3 From nobody Wed Apr 8 10:13:38 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 D830EC6FA83 for ; Sun, 11 Sep 2022 10:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230288AbiIKKr7 (ORCPT ); Sun, 11 Sep 2022 06:47:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230315AbiIKKrc (ORCPT ); Sun, 11 Sep 2022 06:47:32 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55EF92AE28 for ; Sun, 11 Sep 2022 03:47:31 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id bq9so10913259wrb.4 for ; Sun, 11 Sep 2022 03:47:31 -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:subject:date; bh=/BEKoYFEaG0AJXKvbQY58i8UsnsML/dixE5FP50Uz/g=; b=CRO7b5Nn3zhP7tHDNii1L8x22na9nhVm0a6PvDyHXkMY1T2q+KAOnmB0QlwkiyN6Mb RdgLYWJ0XV5CtS1iDIJQ5XgCjp/+f6mRR1bIdsDMxgBtR6JoObKo82H+KD6gx2KgO2J5 DxnYMvQXcOEaaXJJoQ3fGhVQNPJdmk55YXnVnzqr8SVbVaPIOowuJqU/P5/qFIxnyACA WXEq9IFo8rqoCvQXD+s1Hu3w6GKRT5PAX8phNlrE07SZt+60pRn9IKWxOmuHxr9/N2H0 XX9V5Tc8bx3tUDKqU14Zq2C4YpnHEYQOOqpuTRfp2YgX0jNbk5/kgoq+fSX+7v5nv5mP PhyA== 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:subject:date; bh=/BEKoYFEaG0AJXKvbQY58i8UsnsML/dixE5FP50Uz/g=; b=yIaIZrowrGxaz7URnQu06QAL8Bs/55W9BKO/QtIpf81ntnMDEIKwJR48qf/5WHGsXt FOSEhOaGvNSCrbmV+wzaGlPz8rZDDe816CQYsgQOOgT2YbJkWymw7NvBXvJELvwiyhu2 vFRbMuWCLxajCr9Sm5Ozwt94Gpvx1y7+7JKZ8sVBUtTDey29fqKOFpPgKwUgf4pSospA yFlbrSwTBX+oeZsS8SxPQnQGzWF5s2L361syX2tBFcXcWFdQ5es3fJn5gVCb5qoymoS2 Ra+XLmdp4L2BZoTRKPoCmgjFzozMnb/gfKlRKVqqNygjlcZ85ilezsaxP/RWYALtIci0 QkUA== X-Gm-Message-State: ACgBeo0hhTBw+TSutCteUVpv/gbltq5XsWhRv1ZWAs9rq0ZL7PeVQcoV ND723oK1ka0uPwZUhSpsADk= X-Google-Smtp-Source: AA6agR7XxADmw3S4u/aVPV7k8/g8IliYlRSQAn8nrVC3puzyPiAnBOVxrHrgO4AS7E6OI+1QbE+NiA== X-Received: by 2002:a05:6000:1090:b0:228:a963:3641 with SMTP id y16-20020a056000109000b00228a9633641mr12660582wrw.289.1662893250958; Sun, 11 Sep 2022 03:47:30 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id ay3-20020a05600c1e0300b003b339438733sm6264012wmb.19.2022.09.11.03.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Sep 2022 03:47:30 -0700 (PDT) Date: Sun, 11 Sep 2022 12:47:29 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 12/12] staging: vt6655: Rename function MACvSetCurrAC0DescAddrEx 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 function MACvSetCurrAC0DescAddrEx to vt6655_mac_set_curr_ac_0... to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Remove unnecessary line break. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.c | 5 ++--- drivers/staging/vt6655/mac.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 2fbee8508f0e..b4ebc7d31961 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -630,8 +630,7 @@ static void vt6655_mac_set_curr_tx_0_desc_addr_ex(struc= t vnt_private *priv, u32 * */ /* TxDMA1 =3D AC0DMA */ -void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, - u32 curr_desc_addr) +static void vt6655_mac_set_curr_ac_0_desc_addr_ex(struct vnt_private *priv= , u32 curr_desc_addr) { void __iomem *io_base =3D priv->port_offset; unsigned short ww; @@ -655,7 +654,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *pri= v, u32 curr_desc_addr) { if (tx_type =3D=3D TYPE_AC0DMA) - MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); + vt6655_mac_set_curr_ac_0_desc_addr_ex(priv, curr_desc_addr); else if (tx_type =3D=3D TYPE_TXDMA0) vt6655_mac_set_curr_tx_0_desc_addr_ex(priv, curr_desc_addr); } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3fbb891ac57c..acf931c3f5fd 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -559,8 +559,6 @@ void MACvInitialize(struct vnt_private *priv); void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr= _desc_addr); void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *pri= v, u32 curr_desc_addr); -void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, - u32 curr_desc_addr); void MACvSetCurrSyncDescAddrEx(struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrATIMDescAddrEx(struct vnt_private *priv, --=20 2.37.3