net: dsa: mv88e6xxx: rename single-chip support

With the upcoming support for cross-chip operations, it will be hard to
distinguish portions of code supporting a single-chip or a switch fabric
of interconnected chips.

Make the code clearer now, by renaming the mv88e6xxx_priv_state chip
structure to mv88e6xxx_chip. This patch brings no functional changes.

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 2016-06-21 12:28:20 -04:00 коммит произвёл David S. Miller
Родитель 0d3cd4b6b4
Коммит fad09c73c2
3 изменённых файлов: 731 добавлений и 720 удалений

Просмотреть файл

@ -1 +1 @@
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
obj-$(CONFIG_NET_DSA_MV88E6XXX) += chip.o

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -563,7 +563,7 @@ struct mv88e6xxx_priv_port {
struct net_device *bridge_dev;
};
struct mv88e6xxx_priv_state {
struct mv88e6xxx_chip {
const struct mv88e6xxx_info *info;
/* The dsa_switch this private structure is related to */
@ -625,10 +625,8 @@ struct mv88e6xxx_priv_state {
};
struct mv88e6xxx_ops {
int (*read)(struct mv88e6xxx_priv_state *ps,
int addr, int reg, u16 *val);
int (*write)(struct mv88e6xxx_priv_state *ps,
int addr, int reg, u16 val);
int (*read)(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val);
int (*write)(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val);
};
enum stat_type {
@ -644,10 +642,10 @@ struct mv88e6xxx_hw_stat {
enum stat_type type;
};
static inline bool mv88e6xxx_has(struct mv88e6xxx_priv_state *ps,
static inline bool mv88e6xxx_has(struct mv88e6xxx_chip *chip,
unsigned long flags)
{
return (ps->info->flags & flags) == flags;
return (chip->info->flags & flags) == flags;
}
#endif