aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2016-05-10 23:27:24 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-11 19:36:28 -0400
commitff04955c2f678a2c4c3207e0184c4c389da9d1e2 (patch)
treed21e3cc6db20f9c3ed39ef72166cba7de56bd69e /include/net
parentdsa: Remove master_dev from switch structure (diff)
downloadlinux-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 'include/net')
-rw-r--r--include/net/dsa.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h
index f4c0bff8d9d6..17c3d37b6779 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -137,7 +137,7 @@ struct dsa_switch {
/*
* Configuration data for this switch.
*/
- struct dsa_chip_data *pd;
+ struct dsa_chip_data *cd;
/*
* The used switch driver.
@@ -190,7 +190,7 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)
if (dst->cpu_switch == ds->index)
return dst->cpu_port;
else
- return ds->pd->rtable[dst->cpu_switch];
+ return ds->cd->rtable[dst->cpu_switch];
}
struct switchdev_trans;