diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 14:30:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 14:30:00 -0400 |
commit | 7282d491ecaee9883233a0e27283c4c79486279a (patch) | |
tree | 172ffa70716f5493db57976ceef7652120b3332f /drivers/net/pcmcia | |
parent | 76fd85937097a0c2ec8ab23bf21dc10992d1c398 (diff) |
drivers/net: const-ify ethtool_ops declarations
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index fab93360f017..2418cdb9d317 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -245,7 +245,7 @@ static int el3_rx(struct net_device *dev, int worklimit); | |||
245 | static int el3_close(struct net_device *dev); | 245 | static int el3_close(struct net_device *dev); |
246 | static void el3_tx_timeout(struct net_device *dev); | 246 | static void el3_tx_timeout(struct net_device *dev); |
247 | static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 247 | static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
248 | static struct ethtool_ops netdev_ethtool_ops; | 248 | static const struct ethtool_ops netdev_ethtool_ops; |
249 | static void set_rx_mode(struct net_device *dev); | 249 | static void set_rx_mode(struct net_device *dev); |
250 | 250 | ||
251 | static void tc574_detach(struct pcmcia_device *p_dev); | 251 | static void tc574_detach(struct pcmcia_device *p_dev); |
@@ -1095,7 +1095,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1095 | strcpy(info->driver, "3c574_cs"); | 1095 | strcpy(info->driver, "3c574_cs"); |
1096 | } | 1096 | } |
1097 | 1097 | ||
1098 | static struct ethtool_ops netdev_ethtool_ops = { | 1098 | static const struct ethtool_ops netdev_ethtool_ops = { |
1099 | .get_drvinfo = netdev_get_drvinfo, | 1099 | .get_drvinfo = netdev_get_drvinfo, |
1100 | }; | 1100 | }; |
1101 | 1101 | ||
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 875a0fe251e7..a0e2b01c027c 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -158,7 +158,7 @@ static int el3_rx(struct net_device *dev); | |||
158 | static int el3_close(struct net_device *dev); | 158 | static int el3_close(struct net_device *dev); |
159 | static void el3_tx_timeout(struct net_device *dev); | 159 | static void el3_tx_timeout(struct net_device *dev); |
160 | static void set_multicast_list(struct net_device *dev); | 160 | static void set_multicast_list(struct net_device *dev); |
161 | static struct ethtool_ops netdev_ethtool_ops; | 161 | static const struct ethtool_ops netdev_ethtool_ops; |
162 | 162 | ||
163 | static void tc589_detach(struct pcmcia_device *p_dev); | 163 | static void tc589_detach(struct pcmcia_device *p_dev); |
164 | 164 | ||
@@ -530,7 +530,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level) | |||
530 | } | 530 | } |
531 | #endif /* PCMCIA_DEBUG */ | 531 | #endif /* PCMCIA_DEBUG */ |
532 | 532 | ||
533 | static struct ethtool_ops netdev_ethtool_ops = { | 533 | static const struct ethtool_ops netdev_ethtool_ops = { |
534 | .get_drvinfo = netdev_get_drvinfo, | 534 | .get_drvinfo = netdev_get_drvinfo, |
535 | #ifdef PCMCIA_DEBUG | 535 | #ifdef PCMCIA_DEBUG |
536 | .get_msglevel = netdev_get_msglevel, | 536 | .get_msglevel = netdev_get_msglevel, |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index c54f6a7ebf31..a8891a9000ac 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -91,7 +91,7 @@ static void axnet_release(struct pcmcia_device *link); | |||
91 | static int axnet_open(struct net_device *dev); | 91 | static int axnet_open(struct net_device *dev); |
92 | static int axnet_close(struct net_device *dev); | 92 | static int axnet_close(struct net_device *dev); |
93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
94 | static struct ethtool_ops netdev_ethtool_ops; | 94 | static const struct ethtool_ops netdev_ethtool_ops; |
95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); | 95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); |
96 | static void ei_watchdog(u_long arg); | 96 | static void ei_watchdog(u_long arg); |
97 | static void axnet_reset_8390(struct net_device *dev); | 97 | static void axnet_reset_8390(struct net_device *dev); |
@@ -671,7 +671,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
671 | strcpy(info->driver, "axnet_cs"); | 671 | strcpy(info->driver, "axnet_cs"); |
672 | } | 672 | } |
673 | 673 | ||
674 | static struct ethtool_ops netdev_ethtool_ops = { | 674 | static const struct ethtool_ops netdev_ethtool_ops = { |
675 | .get_drvinfo = netdev_get_drvinfo, | 675 | .get_drvinfo = netdev_get_drvinfo, |
676 | }; | 676 | }; |
677 | 677 | ||
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 74211af0e0c9..d682f30dea6e 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -103,7 +103,7 @@ static void fjn_reset(struct net_device *dev); | |||
103 | static struct net_device_stats *fjn_get_stats(struct net_device *dev); | 103 | static struct net_device_stats *fjn_get_stats(struct net_device *dev); |
104 | static void set_rx_mode(struct net_device *dev); | 104 | static void set_rx_mode(struct net_device *dev); |
105 | static void fjn_tx_timeout(struct net_device *dev); | 105 | static void fjn_tx_timeout(struct net_device *dev); |
106 | static struct ethtool_ops netdev_ethtool_ops; | 106 | static const struct ethtool_ops netdev_ethtool_ops; |
107 | 107 | ||
108 | /* | 108 | /* |
109 | card type | 109 | card type |
@@ -1092,7 +1092,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level) | |||
1092 | } | 1092 | } |
1093 | #endif /* PCMCIA_DEBUG */ | 1093 | #endif /* PCMCIA_DEBUG */ |
1094 | 1094 | ||
1095 | static struct ethtool_ops netdev_ethtool_ops = { | 1095 | static const struct ethtool_ops netdev_ethtool_ops = { |
1096 | .get_drvinfo = netdev_get_drvinfo, | 1096 | .get_drvinfo = netdev_get_drvinfo, |
1097 | #ifdef PCMCIA_DEBUG | 1097 | #ifdef PCMCIA_DEBUG |
1098 | .get_msglevel = netdev_get_msglevel, | 1098 | .get_msglevel = netdev_get_msglevel, |
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index b8fe70b85641..bc0ca41a0542 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -126,7 +126,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
126 | strcpy(info->driver, "ibmtr_cs"); | 126 | strcpy(info->driver, "ibmtr_cs"); |
127 | } | 127 | } |
128 | 128 | ||
129 | static struct ethtool_ops netdev_ethtool_ops = { | 129 | static const struct ethtool_ops netdev_ethtool_ops = { |
130 | .get_drvinfo = netdev_get_drvinfo, | 130 | .get_drvinfo = netdev_get_drvinfo, |
131 | }; | 131 | }; |
132 | 132 | ||
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index a8f6bfc96fd2..7d5687e94607 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -431,7 +431,7 @@ static struct net_device_stats *mace_get_stats(struct net_device *dev); | |||
431 | static int mace_rx(struct net_device *dev, unsigned char RxCnt); | 431 | static int mace_rx(struct net_device *dev, unsigned char RxCnt); |
432 | static void restore_multicast_list(struct net_device *dev); | 432 | static void restore_multicast_list(struct net_device *dev); |
433 | static void set_multicast_list(struct net_device *dev); | 433 | static void set_multicast_list(struct net_device *dev); |
434 | static struct ethtool_ops netdev_ethtool_ops; | 434 | static const struct ethtool_ops netdev_ethtool_ops; |
435 | 435 | ||
436 | 436 | ||
437 | static void nmclan_detach(struct pcmcia_device *p_dev); | 437 | static void nmclan_detach(struct pcmcia_device *p_dev); |
@@ -907,7 +907,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level) | |||
907 | } | 907 | } |
908 | #endif /* PCMCIA_DEBUG */ | 908 | #endif /* PCMCIA_DEBUG */ |
909 | 909 | ||
910 | static struct ethtool_ops netdev_ethtool_ops = { | 910 | static const struct ethtool_ops netdev_ethtool_ops = { |
911 | .get_drvinfo = netdev_get_drvinfo, | 911 | .get_drvinfo = netdev_get_drvinfo, |
912 | #ifdef PCMCIA_DEBUG | 912 | #ifdef PCMCIA_DEBUG |
913 | .get_msglevel = netdev_get_msglevel, | 913 | .get_msglevel = netdev_get_msglevel, |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index cc0dcc9bf636..a09c22840f63 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -108,7 +108,7 @@ static void pcnet_release(struct pcmcia_device *link); | |||
108 | static int pcnet_open(struct net_device *dev); | 108 | static int pcnet_open(struct net_device *dev); |
109 | static int pcnet_close(struct net_device *dev); | 109 | static int pcnet_close(struct net_device *dev); |
110 | static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 110 | static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
111 | static struct ethtool_ops netdev_ethtool_ops; | 111 | static const struct ethtool_ops netdev_ethtool_ops; |
112 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); | 112 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); |
113 | static void ei_watchdog(u_long arg); | 113 | static void ei_watchdog(u_long arg); |
114 | static void pcnet_reset_8390(struct net_device *dev); | 114 | static void pcnet_reset_8390(struct net_device *dev); |
@@ -1181,7 +1181,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1181 | strcpy(info->driver, "pcnet_cs"); | 1181 | strcpy(info->driver, "pcnet_cs"); |
1182 | } | 1182 | } |
1183 | 1183 | ||
1184 | static struct ethtool_ops netdev_ethtool_ops = { | 1184 | static const struct ethtool_ops netdev_ethtool_ops = { |
1185 | .get_drvinfo = netdev_get_drvinfo, | 1185 | .get_drvinfo = netdev_get_drvinfo, |
1186 | }; | 1186 | }; |
1187 | 1187 | ||
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 3fb369f2e7ed..a2f3a0e2a005 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -299,7 +299,7 @@ static void mdio_sync(kio_addr_t addr); | |||
299 | static int mdio_read(struct net_device *dev, int phy_id, int loc); | 299 | static int mdio_read(struct net_device *dev, int phy_id, int loc); |
300 | static void mdio_write(struct net_device *dev, int phy_id, int loc, int value); | 300 | static void mdio_write(struct net_device *dev, int phy_id, int loc, int value); |
301 | static int smc_link_ok(struct net_device *dev); | 301 | static int smc_link_ok(struct net_device *dev); |
302 | static struct ethtool_ops ethtool_ops; | 302 | static const struct ethtool_ops ethtool_ops; |
303 | 303 | ||
304 | /*====================================================================== | 304 | /*====================================================================== |
305 | 305 | ||
@@ -2207,7 +2207,7 @@ static int smc_nway_reset(struct net_device *dev) | |||
2207 | return -EOPNOTSUPP; | 2207 | return -EOPNOTSUPP; |
2208 | } | 2208 | } |
2209 | 2209 | ||
2210 | static struct ethtool_ops ethtool_ops = { | 2210 | static const struct ethtool_ops ethtool_ops = { |
2211 | .begin = check_if_running, | 2211 | .begin = check_if_running, |
2212 | .get_drvinfo = smc_get_drvinfo, | 2212 | .get_drvinfo = smc_get_drvinfo, |
2213 | .get_settings = smc_get_settings, | 2213 | .get_settings = smc_get_settings, |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 4122bb46f5ff..62664c01eb45 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -361,7 +361,7 @@ static int set_card_type(struct pcmcia_device *link, const void *s); | |||
361 | static int do_config(struct net_device *dev, struct ifmap *map); | 361 | static int do_config(struct net_device *dev, struct ifmap *map); |
362 | static int do_open(struct net_device *dev); | 362 | static int do_open(struct net_device *dev); |
363 | static int do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 363 | static int do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
364 | static struct ethtool_ops netdev_ethtool_ops; | 364 | static const struct ethtool_ops netdev_ethtool_ops; |
365 | static void hardreset(struct net_device *dev); | 365 | static void hardreset(struct net_device *dev); |
366 | static void do_reset(struct net_device *dev, int full); | 366 | static void do_reset(struct net_device *dev, int full); |
367 | static int init_mii(struct net_device *dev); | 367 | static int init_mii(struct net_device *dev); |
@@ -1553,7 +1553,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1553 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); | 1553 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); |
1554 | } | 1554 | } |
1555 | 1555 | ||
1556 | static struct ethtool_ops netdev_ethtool_ops = { | 1556 | static const struct ethtool_ops netdev_ethtool_ops = { |
1557 | .get_drvinfo = netdev_get_drvinfo, | 1557 | .get_drvinfo = netdev_get_drvinfo, |
1558 | }; | 1558 | }; |
1559 | 1559 | ||