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>

2 files changed, 14 insertions, 14 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 5db779c69a68..eff5dfc2e33f 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -182,7 +182,7 @@ __ATTRIBUTE_GROUPS(dsa_hwmon);
 /* basic switch operations **************************************************/
 static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
 {
-        struct dsa_chip_data *cd = ds->pd;
+        struct dsa_chip_data *cd = ds->cd;
         struct device_node *port_dn;
         struct phy_device *phydev;
         int ret, port, mode;
@@ -219,7 +219,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 {
         struct dsa_switch_driver *drv = ds->drv;
         struct dsa_switch_tree *dst = ds->dst;
-        struct dsa_chip_data *pd = ds->pd;
+        struct dsa_chip_data *cd = ds->cd;
         bool valid_name_found = false;
         int index = ds->index;
         int i, ret;
@@ -230,7 +230,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
         for (i = 0; i < DSA_MAX_PORTS; i++) {
                 char *name;
 
-                name = pd->port_names[i];
+                name = cd->port_names[i];
                 if (name == NULL)
                         continue;
 
@@ -328,10 +328,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                 if (!(ds->enabled_port_mask & (1 << i)))
                         continue;
 
-                ret = dsa_slave_create(ds, parent, i, pd->port_names[i]);
+                ret = dsa_slave_create(ds, parent, i, cd->port_names[i]);
                 if (ret < 0) {
                         netdev_err(dst->master_netdev, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
-                                   index, i, pd->port_names[i], ret);
+                                   index, i, cd->port_names[i], ret);
                         ret = 0;
                 }
         }
@@ -379,7 +379,7 @@ static struct dsa_switch *
 dsa_switch_setup(struct dsa_switch_tree *dst, int index,
                  struct device *parent, struct device *host_dev)
 {
-        struct dsa_chip_data *pd = dst->pd->chip + index;
+        struct dsa_chip_data *cd = dst->pd->chip + index;
         struct dsa_switch_driver *drv;
         struct dsa_switch *ds;
         int ret;
@@ -389,7 +389,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
         /*
          * Probe for switch model.
          */
-        drv = dsa_switch_probe(parent, host_dev, pd->sw_addr, &name, &priv);
+        drv = dsa_switch_probe(parent, host_dev, cd->sw_addr, &name, &priv);
         if (drv == NULL) {
                 netdev_err(dst->master_netdev, "[%d]: could not detect attached switch\n",
                            index);
@@ -408,7 +408,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
 
         ds->dst = dst;
         ds->index = index;
-        ds->pd = pd;
+        ds->cd = cd;
         ds->drv = drv;
         ds->priv = priv;
         ds->dev = parent;
@@ -424,7 +424,7 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
 {
         struct device_node *port_dn;
         struct phy_device *phydev;
-        struct dsa_chip_data *cd = ds->pd;
+        struct dsa_chip_data *cd = ds->cd;
         int port;
 
 #ifdef CONFIG_NET_DSA_HWMON
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index f25dcd9e814a..152436cdab30 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -50,7 +50,7 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds)
         ds->slave_mii_bus->read = dsa_slave_phy_read;
         ds->slave_mii_bus->write = dsa_slave_phy_write;
         snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d:%.2x",
-                        ds->index, ds->pd->sw_addr);
+                        ds->index, ds->cd->sw_addr);
         ds->slave_mii_bus->parent = ds->dev;
         ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;
 }
@@ -615,8 +615,8 @@ static int dsa_slave_get_eeprom_len(struct net_device *dev)
         struct dsa_slave_priv *p = netdev_priv(dev);
         struct dsa_switch *ds = p->parent;
 
-        if (ds->pd->eeprom_len)
-                return ds->pd->eeprom_len;
+        if (ds->cd->eeprom_len)
+                return ds->cd->eeprom_len;
 
         if (ds->drv->get_eeprom_len)
                 return ds->drv->get_eeprom_len(ds);
@@ -999,7 +999,7 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                                 struct net_device *slave_dev)
 {
         struct dsa_switch *ds = p->parent;
-        struct dsa_chip_data *cd = ds->pd;
+        struct dsa_chip_data *cd = ds->cd;
         struct device_node *phy_dn, *port_dn;
         bool phy_is_fixed = false;
         u32 phy_flags = 0;
@@ -1147,7 +1147,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
                                  NULL);
 
         SET_NETDEV_DEV(slave_dev, parent);
-        slave_dev->dev.of_node = ds->pd->port_dn[port];
+        slave_dev->dev.of_node = ds->cd->port_dn[port];
         slave_dev->vlan_features = master->vlan_features;
 
         p = netdev_priv(slave_dev);