switchdev: make struct switchdev_attr parameter const for attr_set calls

jpirko · davem330 · commit f7fadf3047d0 · 2015-10-15T06:09:46.000-07:00
Signed-off-by: Jiri Pirko &lt;jiri@mellanox.com&gt;
Reviewed-by: Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
@@ -4374,7 +4374,7 @@ static int rocker_port_bridge_ageing_time(struct rocker_port *rocker_port,
 }
 
 static int rocker_port_attr_set(struct net_device *dev,
-				struct switchdev_attr *attr,
+				const struct switchdev_attr *attr,
 				struct switchdev_trans *trans)
 {
 	struct rocker_port *rocker_port = netdev_priv(dev);
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
@@ -132,7 +132,7 @@ struct switchdev_ops {
 	int	(*switchdev_port_attr_get)(struct net_device *dev,
 					   struct switchdev_attr *attr);
 	int	(*switchdev_port_attr_set)(struct net_device *dev,
-					   struct switchdev_attr *attr,
+					   const struct switchdev_attr *attr,
 					   struct switchdev_trans *trans);
 	int	(*switchdev_port_obj_add)(struct net_device *dev,
 					  const struct switchdev_obj *obj,
@@ -171,7 +171,7 @@ void switchdev_deferred_process(void);
 int switchdev_port_attr_get(struct net_device *dev,
 			    struct switchdev_attr *attr);
 int switchdev_port_attr_set(struct net_device *dev,
-			    struct switchdev_attr *attr);
+			    const struct switchdev_attr *attr);
 int switchdev_port_obj_add(struct net_device *dev,
 			   const struct switchdev_obj *obj);
 int switchdev_port_obj_del(struct net_device *dev,
@@ -220,7 +220,7 @@ static inline int switchdev_port_attr_get(struct net_device *dev,
 }
 
 static inline int switchdev_port_attr_set(struct net_device *dev,
-					  struct switchdev_attr *attr)
+					  const struct switchdev_attr *attr)
 {
 	return -EOPNOTSUPP;
 }
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
@@ -453,7 +453,7 @@ static int dsa_slave_stp_update(struct net_device *dev, u8 state)
 }
 
 static int dsa_slave_port_attr_set(struct net_device *dev,
-				   struct switchdev_attr *attr,
+				   const struct switchdev_attr *attr,
 				   struct switchdev_trans *trans)
 {
 	struct dsa_slave_priv *p = netdev_priv(dev);
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
@@ -215,7 +215,7 @@ int switchdev_port_attr_get(struct net_device *dev, struct switchdev_attr *attr)
 EXPORT_SYMBOL_GPL(switchdev_port_attr_get);
 
 static int __switchdev_port_attr_set(struct net_device *dev,
-				     struct switchdev_attr *attr,
+				     const struct switchdev_attr *attr,
 				     struct switchdev_trans *trans)
 {
 	const struct switchdev_ops *ops = dev->switchdev_ops;
@@ -274,7 +274,7 @@ static void switchdev_port_attr_set_work(struct work_struct *work)
 }
 
 static int switchdev_port_attr_set_defer(struct net_device *dev,
-					 struct switchdev_attr *attr)
+					 const struct switchdev_attr *attr)
 {
 	struct switchdev_attr_set_work *asw;
 
@@ -303,7 +303,8 @@ static int switchdev_port_attr_set_defer(struct net_device *dev,
  *	system is not left in a partially updated state due to
  *	failure from driver/device.
  */
-int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr)
+int switchdev_port_attr_set(struct net_device *dev,
+			    const struct switchdev_attr *attr)
 {
 	struct switchdev_trans trans;
 	int err;

Original file line number	Diff line number	Diff line change
`@@ -4374,7 +4374,7 @@ static int rocker_port_bridge_ageing_time(struct rocker_port *rocker_port,`
`4374`	`4374`	`}`
`4375`	`4375`
`4376`	`4376`	`static int rocker_port_attr_set(struct net_device *dev,`
`4377`		`- struct switchdev_attr *attr,`
	`4377`	`+ const struct switchdev_attr *attr,`
`4378`	`4378`	`struct switchdev_trans *trans)`
`4379`	`4379`	`{`
`4380`	`4380`	`struct rocker_port *rocker_port = netdev_priv(dev);`
Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ static int dsa_slave_stp_update(struct net_device *dev, u8 state)`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`static int dsa_slave_port_attr_set(struct net_device *dev,`
`456`		`- struct switchdev_attr *attr,`
	`456`	`+ const struct switchdev_attr *attr,`
`457`	`457`	`struct switchdev_trans *trans)`
`458`	`458`	`{`
`459`	`459`	`struct dsa_slave_priv *p = netdev_priv(dev);`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ int switchdev_port_attr_get(struct net_device dev, struct switchdev_attr attr)`
`215`	`215`	`EXPORT_SYMBOL_GPL(switchdev_port_attr_get);`
`216`	`216`
`217`	`217`	`static int __switchdev_port_attr_set(struct net_device *dev,`
`218`		`- struct switchdev_attr *attr,`
	`218`	`+ const struct switchdev_attr *attr,`
`219`	`219`	`struct switchdev_trans *trans)`
`220`	`220`	`{`
`221`	`221`	`const struct switchdev_ops *ops = dev->switchdev_ops;`
`@@ -274,7 +274,7 @@ static void switchdev_port_attr_set_work(struct work_struct *work)`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`static int switchdev_port_attr_set_defer(struct net_device *dev,`
`277`		`- struct switchdev_attr *attr)`
	`277`	`+ const struct switchdev_attr *attr)`
`278`	`278`	`{`
`279`	`279`	`struct switchdev_attr_set_work *asw;`
`280`	`280`
`@@ -303,7 +303,8 @@ static int switchdev_port_attr_set_defer(struct net_device *dev,`
`303`	`303`	`* system is not left in a partially updated state due to`
`304`	`304`	`* failure from driver/device.`
`305`	`305`	`*/`
`306`		`-int switchdev_port_attr_set(struct net_device dev, struct switchdev_attr attr)`
	`306`	`+int switchdev_port_attr_set(struct net_device *dev,`
	`307`	`+ const struct switchdev_attr *attr)`
`307`	`308`	`{`
`308`	`309`	`struct switchdev_trans trans;`
`309`	`310`	`int err;`