Commit 07b1ad83 authored by Christian Marangi's avatar Christian Marangi Committed by David S. Miller
Browse files

net: phy: at803x: raname hw_stats functions to qca83xx specific name 



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: default avatarChristian Marangi <ansuelsmth@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a3b8c57

drivers/net/phy/at803x.c

+22 −22
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct at803x_hw_stat { 
	enum stat_access_type access_type;

};



static struct at803x_hw_stat at803x_hw_stats[] = {

static struct at803x_hw_stat qca83xx_hw_stats[] = {

	{ "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)];

};



struct at803x_context {
@@ -529,24 +529,24 @@ static void at803x_get_wol(struct phy_device *phydev, 
		wol->wolopts |= WAKE_MAGIC;

}



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);

}



static void at803x_get_strings(struct phy_device *phydev, u8 *data)

static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(at803x_hw_stats); i++) {

	for (i = 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);

	}

}



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 = at803x_hw_stats[i];

	struct at803x_hw_stat stat = qca83xx_hw_stats[i];

	struct at803x_priv *priv = phydev->priv;

	int val;

	u64 ret;
@@ -567,13 +567,13 @@ static u64 at803x_get_stat(struct phy_device *phydev, int i) 
	return ret;

}



static void at803x_get_stats(struct phy_device *phydev,

static void qca83xx_get_stats(struct phy_device *phydev,

			      struct ethtool_stats *stats, u64 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(at803x_hw_stats); i++)

		data[i] = at803x_get_stat(phydev, i);

	for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)

		data[i] = qca83xx_get_stat(phydev, i);

}



static int at803x_suspend(struct phy_device *phydev)
@@ -2175,9 +2175,9 @@ static struct phy_driver at803x_driver[] = { 
	.flags			= PHY_IS_INTERNAL,

	.config_init		= qca83xx_config_init,

	.soft_reset		= genphy_soft_reset,

	.get_sset_count		= at803x_get_sset_count,

	.get_strings		= at803x_get_strings,

	.get_stats		= at803x_get_stats,

	.get_sset_count		= qca83xx_get_sset_count,

	.get_strings		= qca83xx_get_strings,

	.get_stats		= qca83xx_get_stats,

	.suspend		= qca83xx_suspend,

	.resume			= qca83xx_resume,

}, {
@@ -2191,9 +2191,9 @@ static struct phy_driver at803x_driver[] = { 
	.flags			= PHY_IS_INTERNAL,

	.config_init		= qca83xx_config_init,

	.soft_reset		= genphy_soft_reset,

	.get_sset_count		= at803x_get_sset_count,

	.get_strings		= at803x_get_strings,

	.get_stats		= at803x_get_stats,

	.get_sset_count		= qca83xx_get_sset_count,

	.get_strings		= qca83xx_get_strings,

	.get_stats		= qca83xx_get_stats,

	.suspend		= qca83xx_suspend,

	.resume			= qca83xx_resume,

}, {
@@ -2207,9 +2207,9 @@ static struct phy_driver at803x_driver[] = { 
	.flags			= PHY_IS_INTERNAL,

	.config_init		= qca83xx_config_init,

	.soft_reset		= genphy_soft_reset,

	.get_sset_count		= at803x_get_sset_count,

	.get_strings		= at803x_get_strings,

	.get_stats		= at803x_get_stats,

	.get_sset_count		= qca83xx_get_sset_count,

	.get_strings		= qca83xx_get_strings,

	.get_stats		= qca83xx_get_stats,

	.suspend		= qca83xx_suspend,

	.resume			= qca83xx_resume,

}, {