Commit b37ecb59 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller

net: phy: aquantia: Shorten name space prefix to aqr_

aquantia_ as a name space prefix is rather long, resulting in lots of
lines needing wrapping, reducing readability. Use the prefix aqr_
instead, which fits with the vendor naming there devices aqr107, for
example.

v2:
- add SoB from Heiner
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fb20801
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define PHY_ID_AQR107 0x03a1b4e0 #define PHY_ID_AQR107 0x03a1b4e0
#define PHY_ID_AQR405 0x03a1b4b0 #define PHY_ID_AQR405 0x03a1b4b0
static int aquantia_config_aneg(struct phy_device *phydev) static int aqr_config_aneg(struct phy_device *phydev)
{ {
linkmode_copy(phydev->supported, phy_10gbit_features); linkmode_copy(phydev->supported, phy_10gbit_features);
linkmode_copy(phydev->advertising, phydev->supported); linkmode_copy(phydev->advertising, phydev->supported);
...@@ -30,7 +30,7 @@ static int aquantia_config_aneg(struct phy_device *phydev) ...@@ -30,7 +30,7 @@ static int aquantia_config_aneg(struct phy_device *phydev)
return 0; return 0;
} }
static int aquantia_config_intr(struct phy_device *phydev) static int aqr_config_intr(struct phy_device *phydev)
{ {
int err; int err;
...@@ -59,7 +59,7 @@ static int aquantia_config_intr(struct phy_device *phydev) ...@@ -59,7 +59,7 @@ static int aquantia_config_intr(struct phy_device *phydev)
return err; return err;
} }
static int aquantia_ack_interrupt(struct phy_device *phydev) static int aqr_ack_interrupt(struct phy_device *phydev)
{ {
int reg; int reg;
...@@ -67,7 +67,7 @@ static int aquantia_ack_interrupt(struct phy_device *phydev) ...@@ -67,7 +67,7 @@ static int aquantia_ack_interrupt(struct phy_device *phydev)
return (reg < 0) ? reg : 0; return (reg < 0) ? reg : 0;
} }
static int aquantia_read_status(struct phy_device *phydev) static int aqr_read_status(struct phy_device *phydev)
{ {
int reg; int reg;
...@@ -102,17 +102,17 @@ static int aquantia_read_status(struct phy_device *phydev) ...@@ -102,17 +102,17 @@ static int aquantia_read_status(struct phy_device *phydev)
return 0; return 0;
} }
static struct phy_driver aquantia_driver[] = { static struct phy_driver aqr_driver[] = {
{ {
.phy_id = PHY_ID_AQ1202, .phy_id = PHY_ID_AQ1202,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Aquantia AQ1202", .name = "Aquantia AQ1202",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
{ {
.phy_id = PHY_ID_AQ2104, .phy_id = PHY_ID_AQ2104,
...@@ -120,10 +120,10 @@ static struct phy_driver aquantia_driver[] = { ...@@ -120,10 +120,10 @@ static struct phy_driver aquantia_driver[] = {
.name = "Aquantia AQ2104", .name = "Aquantia AQ2104",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
{ {
.phy_id = PHY_ID_AQR105, .phy_id = PHY_ID_AQR105,
...@@ -131,10 +131,10 @@ static struct phy_driver aquantia_driver[] = { ...@@ -131,10 +131,10 @@ static struct phy_driver aquantia_driver[] = {
.name = "Aquantia AQR105", .name = "Aquantia AQR105",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
{ {
.phy_id = PHY_ID_AQR106, .phy_id = PHY_ID_AQR106,
...@@ -142,10 +142,10 @@ static struct phy_driver aquantia_driver[] = { ...@@ -142,10 +142,10 @@ static struct phy_driver aquantia_driver[] = {
.name = "Aquantia AQR106", .name = "Aquantia AQR106",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
{ {
.phy_id = PHY_ID_AQR107, .phy_id = PHY_ID_AQR107,
...@@ -153,10 +153,10 @@ static struct phy_driver aquantia_driver[] = { ...@@ -153,10 +153,10 @@ static struct phy_driver aquantia_driver[] = {
.name = "Aquantia AQR107", .name = "Aquantia AQR107",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
{ {
.phy_id = PHY_ID_AQR405, .phy_id = PHY_ID_AQR405,
...@@ -164,16 +164,16 @@ static struct phy_driver aquantia_driver[] = { ...@@ -164,16 +164,16 @@ static struct phy_driver aquantia_driver[] = {
.name = "Aquantia AQR405", .name = "Aquantia AQR405",
.features = PHY_10GBIT_FULL_FEATURES, .features = PHY_10GBIT_FULL_FEATURES,
.aneg_done = genphy_c45_aneg_done, .aneg_done = genphy_c45_aneg_done,
.config_aneg = aquantia_config_aneg, .config_aneg = aqr_config_aneg,
.config_intr = aquantia_config_intr, .config_intr = aqr_config_intr,
.ack_interrupt = aquantia_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aquantia_read_status, .read_status = aqr_read_status,
}, },
}; };
module_phy_driver(aquantia_driver); module_phy_driver(aqr_driver);
static struct mdio_device_id __maybe_unused aquantia_tbl[] = { static struct mdio_device_id __maybe_unused aqr_tbl[] = {
{ PHY_ID_AQ1202, 0xfffffff0 }, { PHY_ID_AQ1202, 0xfffffff0 },
{ PHY_ID_AQ2104, 0xfffffff0 }, { PHY_ID_AQ2104, 0xfffffff0 },
{ PHY_ID_AQR105, 0xfffffff0 }, { PHY_ID_AQR105, 0xfffffff0 },
...@@ -183,7 +183,7 @@ static struct mdio_device_id __maybe_unused aquantia_tbl[] = { ...@@ -183,7 +183,7 @@ static struct mdio_device_id __maybe_unused aquantia_tbl[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(mdio, aquantia_tbl); MODULE_DEVICE_TABLE(mdio, aqr_tbl);
MODULE_DESCRIPTION("Aquantia PHY driver"); MODULE_DESCRIPTION("Aquantia PHY driver");
MODULE_AUTHOR("Shaohui Xie <Shaohui.Xie@freescale.com>"); MODULE_AUTHOR("Shaohui Xie <Shaohui.Xie@freescale.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment