From nobody Wed Dec 17 01:45:36 2025 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 6E0C9C4167B for ; Fri, 1 Dec 2023 00:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377422AbjLAAOu (ORCPT ); Thu, 30 Nov 2023 19:14:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377402AbjLAAOr (ORCPT ); Thu, 30 Nov 2023 19:14:47 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D0FF196; Thu, 30 Nov 2023 16:14:53 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b40423df8so13523955e9.0; Thu, 30 Nov 2023 16:14:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701389692; x=1701994492; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YrcJkPIDuZzmYGZsrVgKVn9yf3oQKZHA4PrUxB3CbJA=; b=IFM+41ifytpBdNfnHq8My1Mqrj5+fex2MklwzjuhL5pTjjCqFgFtyoX7rNvgbU1Ctu tjVm3bvmRRkaCPl4V13F8vkyuKKtx1iVt0etS05xfwUURNVXPVn1i6DqlYzh9/z/NWEl 6QLBSnjif2dsNMznutR5qbAhUrVg3C1V17A//winFI2RU908HNmVkIUmvIotxxsqWCIa fnqZqoLomBwEb5wnwpdG6XSmor/n/48QWUV9ysbKlA7Etgg4xmL87eNevHr9mUH+QRR3 HavAvkRF15gcny/mKfS3hul4MD7F/7pvQ2SLhYAz1dOXgSx0vmyFPKOtSuuZC6oFv0NZ AM7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701389692; x=1701994492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YrcJkPIDuZzmYGZsrVgKVn9yf3oQKZHA4PrUxB3CbJA=; b=ZgaY4l82X+Tc6U0s5/+DuQBWvGTpILUWq5DP3Hk/jHzm/t65Jx1gbp1mMuWcFVBPvh 28Va3JzbGeS56fcVEpzHtGjA/orjcPPsfig2cUdULAW0xr3kwXwWTKBPs+WrAMxxZKep um4f2WeYyglTbfW09UwDK5AgFUarmhxQGpAEo8vtSmrmamG3pKGZ8rcRAJgvhcucL6ar uz0qVSIikRDlGkgZoDpkFtufD5wy/bT7WL2XIaRUWSXuZOLBhIxh+aZ6DtMPO6/udC1g CDzK7LiZ8xyrDhxZHZiepthZYZng6ulxpuO7WnrCc7qUZc355+UQMYSYCNWHye2hnGw+ KkPw== X-Gm-Message-State: AOJu0YwFxzstosjEsw6L0FVbyBFZprjTWsW0u5ZjJP8fyT6sqLAVrBas CgWmVS3zJc14lcIAztVHBz4= X-Google-Smtp-Source: AGHT+IG1gqm7QOIAESQcCkxvsgm4CpBeksxWbuVE6iSdv/PeuI4Jdk/EjHmFtJr2ZmQ3/MzK1a99bg== X-Received: by 2002:a7b:ce13:0:b0:40b:5e4a:40bc with SMTP id m19-20020a7bce13000000b0040b5e4a40bcmr74203wmc.220.1701389691912; Thu, 30 Nov 2023 16:14:51 -0800 (PST) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id g16-20020a05600c4ed000b0040b47c53610sm3535457wmq.14.2023.11.30.16.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 16:14:51 -0800 (PST) From: Christian Marangi To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [net-next PATCH v2 03/12] net: phy: at803x: raname hw_stats functions to qca83xx specific name Date: Fri, 1 Dec 2023 01:14:13 +0100 Message-Id: <20231201001423.20989-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231201001423.20989-1-ansuelsmth@gmail.com> References: <20231201001423.20989-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function and the struct related to hw_stats were specific to qca83xx PHY but were called following the convention in the driver of calling everything with at803x prefix. To better organize the code, rename these function a more specific name to better describe that they are specific to 83xx PHY family. Signed-off-by: Christian Marangi Reviewed-by: Andrew Lunn --- drivers/net/phy/at803x.c | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 85302d96d133..b1ea52ba3f07 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -295,7 +295,7 @@ struct at803x_hw_stat { enum stat_access_type access_type; }; =20 -static struct at803x_hw_stat at803x_hw_stats[] =3D { +static struct at803x_hw_stat qca83xx_hw_stats[] =3D { { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY}, { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY}, { "eee_wake_errors", 0x16, GENMASK(15, 0), MMD}, @@ -311,7 +311,7 @@ struct at803x_priv { bool is_1000basex; struct regulator_dev *vddio_rdev; struct regulator_dev *vddh_rdev; - u64 stats[ARRAY_SIZE(at803x_hw_stats)]; + u64 stats[ARRAY_SIZE(qca83xx_hw_stats)]; }; =20 struct at803x_context { @@ -529,24 +529,24 @@ static void at803x_get_wol(struct phy_device *phydev, wol->wolopts |=3D WAKE_MAGIC; } =20 -static int at803x_get_sset_count(struct phy_device *phydev) +static int qca83xx_get_sset_count(struct phy_device *phydev) { - return ARRAY_SIZE(at803x_hw_stats); + return ARRAY_SIZE(qca83xx_hw_stats); } =20 -static void at803x_get_strings(struct phy_device *phydev, u8 *data) +static void qca83xx_get_strings(struct phy_device *phydev, u8 *data) { int i; =20 - for (i =3D 0; i < ARRAY_SIZE(at803x_hw_stats); i++) { + for (i =3D 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) { strscpy(data + i * ETH_GSTRING_LEN, - at803x_hw_stats[i].string, ETH_GSTRING_LEN); + qca83xx_hw_stats[i].string, ETH_GSTRING_LEN); } } =20 -static u64 at803x_get_stat(struct phy_device *phydev, int i) +static u64 qca83xx_get_stat(struct phy_device *phydev, int i) { - struct at803x_hw_stat stat =3D at803x_hw_stats[i]; + struct at803x_hw_stat stat =3D qca83xx_hw_stats[i]; struct at803x_priv *priv =3D phydev->priv; int val; u64 ret; @@ -567,13 +567,13 @@ static u64 at803x_get_stat(struct phy_device *phydev,= int i) return ret; } =20 -static void at803x_get_stats(struct phy_device *phydev, - struct ethtool_stats *stats, u64 *data) +static void qca83xx_get_stats(struct phy_device *phydev, + struct ethtool_stats *stats, u64 *data) { int i; =20 - for (i =3D 0; i < ARRAY_SIZE(at803x_hw_stats); i++) - data[i] =3D at803x_get_stat(phydev, i); + for (i =3D 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) + data[i] =3D qca83xx_get_stat(phydev, i); } =20 static int at803x_suspend(struct phy_device *phydev) @@ -2177,9 +2177,9 @@ static struct phy_driver at803x_driver[] =3D { .flags =3D PHY_IS_INTERNAL, .config_init =3D qca83xx_config_init, .soft_reset =3D genphy_soft_reset, - .get_sset_count =3D at803x_get_sset_count, - .get_strings =3D at803x_get_strings, - .get_stats =3D at803x_get_stats, + .get_sset_count =3D qca83xx_get_sset_count, + .get_strings =3D qca83xx_get_strings, + .get_stats =3D qca83xx_get_stats, .suspend =3D qca83xx_suspend, .resume =3D qca83xx_resume, }, { @@ -2193,9 +2193,9 @@ static struct phy_driver at803x_driver[] =3D { .flags =3D PHY_IS_INTERNAL, .config_init =3D qca83xx_config_init, .soft_reset =3D genphy_soft_reset, - .get_sset_count =3D at803x_get_sset_count, - .get_strings =3D at803x_get_strings, - .get_stats =3D at803x_get_stats, + .get_sset_count =3D qca83xx_get_sset_count, + .get_strings =3D qca83xx_get_strings, + .get_stats =3D qca83xx_get_stats, .suspend =3D qca83xx_suspend, .resume =3D qca83xx_resume, }, { @@ -2209,9 +2209,9 @@ static struct phy_driver at803x_driver[] =3D { .flags =3D PHY_IS_INTERNAL, .config_init =3D qca83xx_config_init, .soft_reset =3D genphy_soft_reset, - .get_sset_count =3D at803x_get_sset_count, - .get_strings =3D at803x_get_strings, - .get_stats =3D at803x_get_stats, + .get_sset_count =3D qca83xx_get_sset_count, + .get_strings =3D qca83xx_get_strings, + .get_stats =3D qca83xx_get_stats, .suspend =3D qca83xx_suspend, .resume =3D qca83xx_resume, }, { --=20 2.40.1