diff options
author | Andrew Lunn <andrew@lunn.ch> | 2016-05-10 23:27:24 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-11 19:36:28 -0400 |
commit | ff04955c2f678a2c4c3207e0184c4c389da9d1e2 (patch) | |
tree | d21e3cc6db20f9c3ed39ef72166cba7de56bd69e /drivers/net/dsa/mv88e6xxx.c | |
parent | dsa: Remove master_dev from switch structure (diff) | |
download | linux-dev-ff04955c2f678a2c4c3207e0184c4c389da9d1e2.tar.xz linux-dev-ff04955c2f678a2c4c3207e0184c4c389da9d1e2.zip |
dsa: Rename switch chip data to cd
The dsa_switch structure contains a dsa_chip_data member called pd.
However in the rest of the code, pd is used for dsa_platform_data.
This is confusing. Rename it cd, which is already often used in dsa.c
and slave.c for this data type.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 8659cbaac9f9..ee7830935a73 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -3023,9 +3023,9 @@ static int mv88e6xxx_setup_global(struct mv88e6xxx_priv_state *ps) for (i = 0; i < 32; i++) { int nexthop = 0x1f; - if (ps->ds->pd->rtable && + if (ps->ds->cd->rtable && i != ps->ds->index && i < ps->ds->dst->pd->nr_chips) - nexthop = ps->ds->pd->rtable[i] & 0x1f; + nexthop = ps->ds->cd->rtable[i] & 0x1f; err = _mv88e6xxx_reg_write( ps, REG_GLOBAL2, |