In order to be uniform with the rest of the driver, prepend hidden
register macro names with the MV88E6XXX_ prefix. Also do not use the
BIT() macro nor bit shifts, to be consistent with rest of port.h macro
definitions.

Signed-off-by: Marek Behún <marek.be...@nic.cz>
Reviewed-by: Andrew Lunn <and...@lunn.ch>
---
 drivers/net/dsa/mv88e6xxx/port.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index 2b251ba30e52..58aecf5a7cb4 100644
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -261,14 +261,14 @@
 #define MV88E6095_PORT_IEEE_PRIO_REMAP_4567    0x19
 
 /* Offset 0x1a: Magic undocumented errata register */
-#define PORT_RESERVED_1A                       0x1a
-#define PORT_RESERVED_1A_BUSY                  BIT(15)
-#define PORT_RESERVED_1A_WRITE                 BIT(14)
-#define PORT_RESERVED_1A_READ                  0
-#define PORT_RESERVED_1A_PORT_SHIFT            5
-#define PORT_RESERVED_1A_BLOCK                 (0xf << 10)
-#define PORT_RESERVED_1A_CTRL_PORT             4
-#define PORT_RESERVED_1A_DATA_PORT             5
+#define MV88E6XXX_PORT_RESERVED_1A             0x1a
+#define MV88E6XXX_PORT_RESERVED_1A_BUSY                0x8000
+#define MV88E6XXX_PORT_RESERVED_1A_WRITE       0x4000
+#define MV88E6XXX_PORT_RESERVED_1A_READ                0x0000
+#define MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT  5
+#define MV88E6XXX_PORT_RESERVED_1A_BLOCK       0x3c00
+#define MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT   0x04
+#define MV88E6XXX_PORT_RESERVED_1A_DATA_PORT   0x05
 
 int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,
                        u16 *val);
-- 
2.21.0

Reply via email to