aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
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/net/usb
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/net/usb')
-rw-r--r--drivers/net/usb/asix.c4
-rw-r--r--drivers/net/usb/catc.c2
-rw-r--r--drivers/net/usb/dm9601.c2
-rw-r--r--drivers/net/usb/hso.c2
-rw-r--r--drivers/net/usb/kaweth.c2
-rw-r--r--drivers/net/usb/mcs7830.c2
-rw-r--r--drivers/net/usb/pegasus.c2
-rw-r--r--drivers/net/usb/rtl8150.c2
-rw-r--r--drivers/net/usb/smsc95xx.c2
-rw-r--r--drivers/net/usb/usbnet.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 87b4a028991..6ce7f775bb7 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -731,7 +731,7 @@ static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
731/* We need to override some ethtool_ops so we require our 731/* We need to override some ethtool_ops so we require our
732 own structure so we don't interfere with other usbnet 732 own structure so we don't interfere with other usbnet
733 devices that may be connected at the same time. */ 733 devices that may be connected at the same time. */
734static struct ethtool_ops ax88172_ethtool_ops = { 734static const struct ethtool_ops ax88172_ethtool_ops = {
735 .get_drvinfo = asix_get_drvinfo, 735 .get_drvinfo = asix_get_drvinfo,
736 .get_link = asix_get_link, 736 .get_link = asix_get_link,
737 .get_msglevel = usbnet_get_msglevel, 737 .get_msglevel = usbnet_get_msglevel,
@@ -873,7 +873,7 @@ out:
873 return ret; 873 return ret;
874} 874}
875 875
876static struct ethtool_ops ax88772_ethtool_ops = { 876static const struct ethtool_ops ax88772_ethtool_ops = {
877 .get_drvinfo = asix_get_drvinfo, 877 .get_drvinfo = asix_get_drvinfo,
878 .get_link = asix_get_link, 878 .get_link = asix_get_link,
879 .get_msglevel = usbnet_get_msglevel, 879 .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 0ffc0c6d03b..2bed6b087d1 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -698,7 +698,7 @@ static int catc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
698 return 0; 698 return 0;
699} 699}
700 700
701static struct ethtool_ops ops = { 701static const struct ethtool_ops ops = {
702 .get_drvinfo = catc_get_drvinfo, 702 .get_drvinfo = catc_get_drvinfo,
703 .get_settings = catc_get_settings, 703 .get_settings = catc_get_settings,
704 .get_link = ethtool_op_get_link 704 .get_link = ethtool_op_get_link
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 1d3730d6690..72470f77f55 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -356,7 +356,7 @@ static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
356 return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); 356 return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
357} 357}
358 358
359static struct ethtool_ops dm9601_ethtool_ops = { 359static const struct ethtool_ops dm9601_ethtool_ops = {
360 .get_drvinfo = dm9601_get_drvinfo, 360 .get_drvinfo = dm9601_get_drvinfo,
361 .get_link = dm9601_get_link, 361 .get_link = dm9601_get_link,
362 .get_msglevel = usbnet_get_msglevel, 362 .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 123f9b84dd2..3f9c92a2afc 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -829,7 +829,7 @@ static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info
829 usb_make_path(odev->parent->usb, info->bus_info, sizeof info->bus_info); 829 usb_make_path(odev->parent->usb, info->bus_info, sizeof info->bus_info);
830} 830}
831 831
832static struct ethtool_ops ops = { 832static const struct ethtool_ops ops = {
833 .get_drvinfo = hso_get_drvinfo, 833 .get_drvinfo = hso_get_drvinfo,
834 .get_link = ethtool_op_get_link 834 .get_link = ethtool_op_get_link
835}; 835};
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 7f397365b43..e2a39b9be96 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -778,7 +778,7 @@ static u32 kaweth_get_link(struct net_device *dev)
778 return kaweth->linkstate; 778 return kaweth->linkstate;
779} 779}
780 780
781static struct ethtool_ops ops = { 781static const struct ethtool_ops ops = {
782 .get_drvinfo = kaweth_get_drvinfo, 782 .get_drvinfo = kaweth_get_drvinfo,
783 .get_link = kaweth_get_link 783 .get_link = kaweth_get_link
784}; 784};
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 7ae9afe99a4..10873d96b2d 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -449,7 +449,7 @@ static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs,
449 mcs7830_get_reg(dev, 0, regs->len, data); 449 mcs7830_get_reg(dev, 0, regs->len, data);
450} 450}
451 451
452static struct ethtool_ops mcs7830_ethtool_ops = { 452static const struct ethtool_ops mcs7830_ethtool_ops = {
453 .get_drvinfo = mcs7830_get_drvinfo, 453 .get_drvinfo = mcs7830_get_drvinfo,
454 .get_regs_len = mcs7830_get_regs_len, 454 .get_regs_len = mcs7830_get_regs_len,
455 .get_regs = mcs7830_get_regs, 455 .get_regs = mcs7830_get_regs,
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7b935b84642..6fdaba8674b 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1174,7 +1174,7 @@ static void pegasus_set_msglevel(struct net_device *dev, u32 v)
1174 pegasus->msg_enable = v; 1174 pegasus->msg_enable = v;
1175} 1175}
1176 1176
1177static struct ethtool_ops ops = { 1177static const struct ethtool_ops ops = {
1178 .get_drvinfo = pegasus_get_drvinfo, 1178 .get_drvinfo = pegasus_get_drvinfo,
1179 .get_settings = pegasus_get_settings, 1179 .get_settings = pegasus_get_settings,
1180 .set_settings = pegasus_set_settings, 1180 .set_settings = pegasus_set_settings,
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index d9f84f22fbc..b091e20ca16 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -865,7 +865,7 @@ static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *e
865 return 0; 865 return 0;
866} 866}
867 867
868static struct ethtool_ops ops = { 868static const struct ethtool_ops ops = {
869 .get_drvinfo = rtl8150_get_drvinfo, 869 .get_drvinfo = rtl8150_get_drvinfo,
870 .get_settings = rtl8150_get_settings, 870 .get_settings = rtl8150_get_settings,
871 .get_link = ethtool_op_get_link 871 .get_link = ethtool_op_get_link
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 09bd6351f64..938fb3530a7 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -625,7 +625,7 @@ static int smsc95xx_ethtool_set_tx_csum(struct net_device *netdev, u32 val)
625 return smsc95xx_set_csums(dev); 625 return smsc95xx_set_csums(dev);
626} 626}
627 627
628static struct ethtool_ops smsc95xx_ethtool_ops = { 628static const struct ethtool_ops smsc95xx_ethtool_ops = {
629 .get_link = usbnet_get_link, 629 .get_link = usbnet_get_link,
630 .nway_reset = usbnet_nway_reset, 630 .nway_reset = usbnet_nway_reset,
631 .get_drvinfo = usbnet_get_drvinfo, 631 .get_drvinfo = usbnet_get_drvinfo,
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index d166e3385c6..24b36f79515 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -854,7 +854,7 @@ void usbnet_set_msglevel (struct net_device *net, u32 level)
854EXPORT_SYMBOL_GPL(usbnet_set_msglevel); 854EXPORT_SYMBOL_GPL(usbnet_set_msglevel);
855 855
856/* drivers may override default ethtool_ops in their bind() routine */ 856/* drivers may override default ethtool_ops in their bind() routine */
857static struct ethtool_ops usbnet_ethtool_ops = { 857static const struct ethtool_ops usbnet_ethtool_ops = {
858 .get_settings = usbnet_get_settings, 858 .get_settings = usbnet_get_settings,
859 .set_settings = usbnet_set_settings, 859 .set_settings = usbnet_set_settings,
860 .get_link = usbnet_get_link, 860 .get_link = usbnet_get_link,