xgbe: constify get_netdev_ops and get_ethtool_ops

shemminger · davem330 · commit ce0b15d11031 · 2016-08-31T14:17:30.000-07:00
Casting away const is bad practice. Since this is ARM specific driver
don't have hardware actually test this.

Having getter functions for ops is really unnecessary code bloat, but
not going to touch that.

Signed-off-by: Stephen Hemminger &lt;stephen@networkplumber.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1708,9 +1708,9 @@ static const struct net_device_ops xgbe_netdev_ops = {
 	.ndo_set_features	= xgbe_set_features,
 };
 
-struct net_device_ops *xgbe_get_netdev_ops(void)
+const struct net_device_ops *xgbe_get_netdev_ops(void)
 {
-	return (struct net_device_ops *)&xgbe_netdev_ops;
+	return &xgbe_netdev_ops;
 }
 
 static void xgbe_rx_refresh(struct xgbe_channel *channel)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
@@ -623,7 +623,7 @@ static const struct ethtool_ops xgbe_ethtool_ops = {
 	.get_ts_info = xgbe_get_ts_info,
 };
 
-struct ethtool_ops *xgbe_get_ethtool_ops(void)
+const struct ethtool_ops *xgbe_get_ethtool_ops(void)
 {
-	return (struct ethtool_ops *)&xgbe_ethtool_ops;
+	return &xgbe_ethtool_ops;
 }
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -956,8 +956,9 @@ struct xgbe_prv_data {
 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
 void xgbe_init_function_ptrs_phy(struct xgbe_phy_if *);
 void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *);
-struct net_device_ops *xgbe_get_netdev_ops(void);
-struct ethtool_ops *xgbe_get_ethtool_ops(void);
+const struct net_device_ops *xgbe_get_netdev_ops(void);
+const struct ethtool_ops *xgbe_get_ethtool_ops(void);
+
 #ifdef CONFIG_AMD_XGBE_DCB
 const struct dcbnl_rtnl_ops *xgbe_get_dcbnl_ops(void);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1708,9 +1708,9 @@ static const struct net_device_ops xgbe_netdev_ops = {`
`1708`	`1708`	`.ndo_set_features = xgbe_set_features,`
`1709`	`1709`	`};`
`1710`	`1710`
`1711`		`-struct net_device_ops *xgbe_get_netdev_ops(void)`
	`1711`	`+const struct net_device_ops *xgbe_get_netdev_ops(void)`
`1712`	`1712`	`{`
`1713`		`- return (struct net_device_ops *)&xgbe_netdev_ops;`
	`1713`	`+ return &xgbe_netdev_ops;`
`1714`	`1714`	`}`
`1715`	`1715`
`1716`	`1716`	`static void xgbe_rx_refresh(struct xgbe_channel *channel)`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ static const struct ethtool_ops xgbe_ethtool_ops = {`
`623`	`623`	`.get_ts_info = xgbe_get_ts_info,`
`624`	`624`	`};`
`625`	`625`
`626`		`-struct ethtool_ops *xgbe_get_ethtool_ops(void)`
	`626`	`+const struct ethtool_ops *xgbe_get_ethtool_ops(void)`
`627`	`627`	`{`
`628`		`- return (struct ethtool_ops *)&xgbe_ethtool_ops;`
	`628`	`+ return &xgbe_ethtool_ops;`
`629`	`629`	`}`