hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: rename ATU MAC accessors 

Rename the __mv88e6xxx_{read,write}_addr functions to more explicit
_mv88e6xxx_atu_mac_{read,write} functions, which also respect the single
underscore convention used in the file (meaning SMI lock must be held).

In the meantime, define their MAC address parameters as an array of
ETH_ALEN bytes instead of a char pointer.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2015-08-06 01:44:06 -04:00 committed by David S. Miller
parent 368b1d9c10
commit 395059fb92
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/dsa/mv88e6xxx.c
View File

@ -1182,8 +1182,8 @@ int mv88e6xxx_port_stp_update(struct dsa_switch *ds, int port, u8 state)
return 0; return 0;
} }
static int __mv88e6xxx_write_addr(struct dsa_switch *ds, static int _mv88e6xxx_atu_mac_write(struct dsa_switch *ds,
const unsigned char *addr) const u8 addr[ETH_ALEN])
{ {
int i, ret; int i, ret;
@ -1198,7 +1198,7 @@ static int __mv88e6xxx_write_addr(struct dsa_switch *ds,
return 0; return 0;
} }
static int __mv88e6xxx_read_addr(struct dsa_switch *ds, unsigned char *addr) static int _mv88e6xxx_atu_mac_read(struct dsa_switch *ds, u8 addr[ETH_ALEN])
{ {
int i, ret; int i, ret;
@ -1225,7 +1225,7 @@ static int __mv88e6xxx_port_fdb_cmd(struct dsa_switch *ds, int port,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = __mv88e6xxx_write_addr(ds, addr); ret = _mv88e6xxx_atu_mac_write(ds, addr);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1280,7 +1280,7 @@ static int __mv88e6xxx_port_getnext(struct dsa_switch *ds, int port,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = __mv88e6xxx_write_addr(ds, addr); ret = _mv88e6xxx_atu_mac_write(ds, addr);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1297,7 +1297,7 @@ static int __mv88e6xxx_port_getnext(struct dsa_switch *ds, int port,
return -ENOENT; return -ENOENT;
} while (!(((ret >> 4) & 0xff) & (1 << port))); } while (!(((ret >> 4) & 0xff) & (1 << port)));
ret = __mv88e6xxx_read_addr(ds, addr); ret = _mv88e6xxx_atu_mac_read(ds, addr);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1659,7 +1659,7 @@ static int mv88e6xxx_atu_show_db(struct seq_file *s, struct dsa_switch *ds,
unsigned char addr[6]; unsigned char addr[6];
int ret, data, state; int ret, data, state;
ret = __mv88e6xxx_write_addr(ds, bcast); ret = _mv88e6xxx_atu_mac_write(ds, bcast);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1674,7 +1674,7 @@ static int mv88e6xxx_atu_show_db(struct seq_file *s, struct dsa_switch *ds,
state = data & GLOBAL_ATU_DATA_STATE_MASK; state = data & GLOBAL_ATU_DATA_STATE_MASK;
if (state == GLOBAL_ATU_DATA_STATE_UNUSED) if (state == GLOBAL_ATU_DATA_STATE_UNUSED)
break; break;
ret = __mv88e6xxx_read_addr(ds, addr); ret = _mv88e6xxx_atu_mac_read(ds, addr);
if (ret < 0) if (ret < 0)
return ret; return ret;
mv88e6xxx_atu_show_entry(s, dbnum, addr, data); mv88e6xxx_atu_show_entry(s, dbnum, addr, data);