Skip to content

Commit bec90b6

Browse files
viviendavem330
authored andcommitted
net: dsa: mv88e6xxx: prefix PHY macros
Prefix the PHY_* macros with a Marvell specific MV88E6XXX_ prefix. There is no functional changes. Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Vivien Didelot <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent cd78265 commit bec90b6

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

drivers/net/dsa/mv88e6xxx/phy.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int mv88e6xxx_phy_write(struct mv88e6xxx_chip *chip, int phy, int reg, u16 val)
6262

6363
static int mv88e6xxx_phy_page_get(struct mv88e6xxx_chip *chip, int phy, u8 page)
6464
{
65-
return mv88e6xxx_phy_write(chip, phy, PHY_PAGE, page);
65+
return mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE, page);
6666
}
6767

6868
static void mv88e6xxx_phy_page_put(struct mv88e6xxx_chip *chip, int phy)
@@ -72,7 +72,8 @@ static void mv88e6xxx_phy_page_put(struct mv88e6xxx_chip *chip, int phy)
7272
/* Restore PHY page Copper 0x0 for access via the registered
7373
* MDIO bus
7474
*/
75-
err = mv88e6xxx_phy_write(chip, phy, PHY_PAGE, PHY_PAGE_COPPER);
75+
err = mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE,
76+
MV88E6XXX_PHY_PAGE_COPPER);
7677
if (unlikely(err)) {
7778
dev_err(chip->dev,
7879
"failed to restore PHY %d page Copper (%d)\n",
@@ -86,7 +87,7 @@ int mv88e6xxx_phy_page_read(struct mv88e6xxx_chip *chip, int phy,
8687
int err;
8788

8889
/* There is no paging for registers 22 */
89-
if (reg == PHY_PAGE)
90+
if (reg == MV88E6XXX_PHY_PAGE)
9091
return -EINVAL;
9192

9293
err = mv88e6xxx_phy_page_get(chip, phy, page);
@@ -104,12 +105,12 @@ int mv88e6xxx_phy_page_write(struct mv88e6xxx_chip *chip, int phy,
104105
int err;
105106

106107
/* There is no paging for registers 22 */
107-
if (reg == PHY_PAGE)
108+
if (reg == MV88E6XXX_PHY_PAGE)
108109
return -EINVAL;
109110

110111
err = mv88e6xxx_phy_page_get(chip, phy, page);
111112
if (!err) {
112-
err = mv88e6xxx_phy_write(chip, phy, PHY_PAGE, page);
113+
err = mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE, page);
113114
mv88e6xxx_phy_page_put(chip, phy);
114115
}
115116

drivers/net/dsa/mv88e6xxx/phy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef _MV88E6XXX_PHY_H
1515
#define _MV88E6XXX_PHY_H
1616

17-
#define PHY_PAGE 0x16
18-
#define PHY_PAGE_COPPER 0x00
17+
#define MV88E6XXX_PHY_PAGE 0x16
18+
#define MV88E6XXX_PHY_PAGE_COPPER 0x00
1919

2020
/* PHY Registers accesses implementations */
2121
int mv88e6165_phy_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus,

0 commit comments

Comments
 (0)