aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-09-02 04:03:33 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-02 04:03:33 -0400
commit0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec (patch)
tree2423b134116c16f027ebeae7954c098f27d6e619 /drivers/staging
parentdaf09de817353f18bb81a23a023d429cfd258e62 (diff)
netdev: drivers should make ethtool_ops const
No need to put ethtool_ops in data, they should be const. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/at76_usb/at76_usb.c2
-rw-r--r--drivers/staging/octeon/ethernet-mdio.c2
-rw-r--r--drivers/staging/octeon/ethernet-mdio.h2
-rw-r--r--drivers/staging/sxg/sxg.h2
-rw-r--r--drivers/staging/sxg/sxg_ethtool.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index 7b8aa5edf42..c165c50c011 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -3396,7 +3396,7 @@ static u32 at76_ethtool_get_link(struct net_device *netdev)
3396 return priv->mac_state == MAC_CONNECTED; 3396 return priv->mac_state == MAC_CONNECTED;
3397} 3397}
3398 3398
3399static struct ethtool_ops at76_ethtool_ops = { 3399static const struct ethtool_ops at76_ethtool_ops = {
3400 .get_drvinfo = at76_ethtool_get_drvinfo, 3400 .get_drvinfo = at76_ethtool_get_drvinfo,
3401 .get_link = at76_ethtool_get_link, 3401 .get_link = at76_ethtool_get_link,
3402}; 3402};
diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 93cab0a4892..42230e62a22 100644
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -170,7 +170,7 @@ static u32 cvm_oct_get_link(struct net_device *dev)
170 return ret; 170 return ret;
171} 171}
172 172
173struct ethtool_ops cvm_oct_ethtool_ops = { 173struct const ethtool_ops cvm_oct_ethtool_ops = {
174 .get_drvinfo = cvm_oct_get_drvinfo, 174 .get_drvinfo = cvm_oct_get_drvinfo,
175 .get_settings = cvm_oct_get_settings, 175 .get_settings = cvm_oct_get_settings,
176 .set_settings = cvm_oct_set_settings, 176 .set_settings = cvm_oct_set_settings,
diff --git a/drivers/staging/octeon/ethernet-mdio.h b/drivers/staging/octeon/ethernet-mdio.h
index 6314141e5ef..b3328aeec2d 100644
--- a/drivers/staging/octeon/ethernet-mdio.h
+++ b/drivers/staging/octeon/ethernet-mdio.h
@@ -41,6 +41,6 @@
41#include <net/xfrm.h> 41#include <net/xfrm.h>
42#endif /* CONFIG_XFRM */ 42#endif /* CONFIG_XFRM */
43 43
44extern struct ethtool_ops cvm_oct_ethtool_ops; 44extern const struct ethtool_ops cvm_oct_ethtool_ops;
45int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 45int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
46int cvm_oct_mdio_setup_device(struct net_device *dev); 46int cvm_oct_mdio_setup_device(struct net_device *dev);
diff --git a/drivers/staging/sxg/sxg.h b/drivers/staging/sxg/sxg.h
index f07aa708d86..110096a5c52 100644
--- a/drivers/staging/sxg/sxg.h
+++ b/drivers/staging/sxg/sxg.h
@@ -782,6 +782,6 @@ struct slic_crash_info {
782#define SIOCSLICSETINTAGG (SIOCDEVPRIVATE+10) 782#define SIOCSLICSETINTAGG (SIOCDEVPRIVATE+10)
783#define SIOCSLICTRACEDUMP (SIOCDEVPRIVATE+11) 783#define SIOCSLICTRACEDUMP (SIOCDEVPRIVATE+11)
784 784
785extern struct ethtool_ops sxg_nic_ethtool_ops; 785extern const struct ethtool_ops sxg_nic_ethtool_ops;
786#define SXG_COMPLETE_SLOW_SEND_LIMIT 128 786#define SXG_COMPLETE_SLOW_SEND_LIMIT 128
787#endif /* __SXG_DRIVER_H__ */ 787#endif /* __SXG_DRIVER_H__ */
diff --git a/drivers/staging/sxg/sxg_ethtool.c b/drivers/staging/sxg/sxg_ethtool.c
index ad89cb829b8..f5a0706478d 100644
--- a/drivers/staging/sxg/sxg_ethtool.c
+++ b/drivers/staging/sxg/sxg_ethtool.c
@@ -300,7 +300,7 @@ static int sxg_nic_get_eeprom(struct net_device *netdev,
300 return 0; 300 return 0;
301} 301}
302 302
303struct ethtool_ops sxg_nic_ethtool_ops = { 303const struct ethtool_ops sxg_nic_ethtool_ops = {
304 .get_settings = sxg_nic_get_settings, 304 .get_settings = sxg_nic_get_settings,
305 .set_settings = sxg_nic_set_settings, 305 .set_settings = sxg_nic_set_settings,
306 .get_drvinfo = sxg_nic_get_drvinfo, 306 .get_drvinfo = sxg_nic_get_drvinfo,