net: dsa: mv88e6xxx: prefix Port Based VLAN macros

For implicit namespacing and clarity, prefix the common Port Based VLAN
Register macros with MV88E6XXX_PORT_BASE_VLAN.

Document the register and prefer ordered hex masks values for all
Marvell 16-bit registers.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index 6b972626f326b1d29abc5710df9715429e2bedcb..3cd3b4b7c944a9f584a0043f90272203afcc1172 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -615,14 +615,14 @@ int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map)
        u16 reg;
        int err;
 
-       err = mv88e6xxx_port_read(chip, port, PORT_BASE_VLAN, &reg);
+       err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_BASE_VLAN, &reg);
        if (err)
                return err;
 
        reg &= ~mask;
        reg |= map & mask;
 
-       err = mv88e6xxx_port_write(chip, port, PORT_BASE_VLAN, reg);
+       err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_BASE_VLAN, reg);
        if (err)
                return err;
 
@@ -638,7 +638,7 @@ int mv88e6xxx_port_get_fid(struct mv88e6xxx_chip *chip, int port, u16 *fid)
        int err;
 
        /* Port's default FID lower 4 bits are located in reg 0x06, offset 12 */
-       err = mv88e6xxx_port_read(chip, port, PORT_BASE_VLAN, &reg);
+       err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_BASE_VLAN, &reg);
        if (err)
                return err;
 
@@ -667,14 +667,14 @@ int mv88e6xxx_port_set_fid(struct mv88e6xxx_chip *chip, int port, u16 fid)
                return -EINVAL;
 
        /* Port's default FID lower 4 bits are located in reg 0x06, offset 12 */
-       err = mv88e6xxx_port_read(chip, port, PORT_BASE_VLAN, &reg);
+       err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_BASE_VLAN, &reg);
        if (err)
                return err;
 
        reg &= 0x0fff;
        reg |= (fid & 0x000f) << 12;
 
-       err = mv88e6xxx_port_write(chip, port, PORT_BASE_VLAN, reg);
+       err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_BASE_VLAN, reg);
        if (err)
                return err;
 

diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index 451f99fd81cf3be709e875925f3983fdfe93550a..23d94f61cac7a0ec07c97dc1d25020f37f78c360 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -146,8 +146,10 @@
 #define MV88E6XXX_PORT_CTL1_MESSAGE_PORT       0x8000
 #define MV88E6XXX_PORT_CTL1_FID_11_4_MASK      0x00ff
 
-#define PORT_BASE_VLAN         0x06
-#define PORT_BASE_VLAN_FID_3_0_MASK    (0xf << 12)
+/* Offset 0x06: Port Based VLAN Map */
+#define MV88E6XXX_PORT_BASE_VLAN               0x06
+#define MV88E6XXX_PORT_BASE_VLAN_FID_3_0_MASK  0xf000
+
 #define PORT_DEFAULT_VLAN      0x07
 #define PORT_DEFAULT_VLAN_MASK 0xfff
 #define PORT_CONTROL_2         0x08