aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-23 14:20:03 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-25 18:35:43 -0400
commitc061b18df0f1fe3f50fe451dbbdc9ede3c19701a (patch)
tree91508aff083ab7a93d1e7f3b6eb933059d1a2776 /drivers
parent31018e068edb9eed740bec5cf14802c3c676c9ee (diff)
drivers/net: Remove address use from assignments of function pointers
"foo = &function" is more commonly written "foo = function" Done with coccinelle script: // <smpl> @r@ identifier f; @@ f(...) { ... } @@ identifier r.f; @@ - &f + f // </smpl> drivers/net/tehuti.c used a function and struct with the same name, the function was renamed. Compile tested x86 only. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/3c503.c8
-rw-r--r--drivers/net/3c515.c2
-rw-r--r--drivers/net/3c59x.c2
-rw-r--r--drivers/net/atl1e/atl1e_main.c2
-rw-r--r--drivers/net/atlx/atl1.c2
-rw-r--r--drivers/net/atlx/atl2.c4
-rw-r--r--drivers/net/atp.c2
-rw-r--r--drivers/net/bcm63xx_enet.c2
-rw-r--r--drivers/net/cpmac.c2
-rw-r--r--drivers/net/declance.c2
-rw-r--r--drivers/net/dl2k.c2
-rw-r--r--drivers/net/e1000/e1000_main.c6
-rw-r--r--drivers/net/e1000e/netdev.c4
-rw-r--r--drivers/net/ehea/ehea_main.c6
-rw-r--r--drivers/net/epic100.c2
-rw-r--r--drivers/net/fealnx.c4
-rw-r--r--drivers/net/forcedeth.c6
-rw-r--r--drivers/net/hamachi.c2
-rw-r--r--drivers/net/hp.c8
-rw-r--r--drivers/net/hydra.c8
-rw-r--r--drivers/net/igb/igb_main.c4
-rw-r--r--drivers/net/ioc3-eth.c2
-rw-r--r--drivers/net/ixgb/ixgb_main.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
-rw-r--r--drivers/net/ixgbevf/ixgbevf_main.c2
-rw-r--r--drivers/net/mac8390.c48
-rw-r--r--drivers/net/natsemi.c2
-rw-r--r--drivers/net/pci-skeleton.c2
-rw-r--r--drivers/net/pcmcia/3c574_cs.c2
-rw-r--r--drivers/net/pcmcia/3c589_cs.c2
-rw-r--r--drivers/net/pcmcia/axnet_cs.c10
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c16
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c4
-rw-r--r--drivers/net/rrunner.c2
-rw-r--r--drivers/net/sh_eth.c2
-rw-r--r--drivers/net/sis900.c2
-rw-r--r--drivers/net/sunbmac.c2
-rw-r--r--drivers/net/sundance.c2
-rw-r--r--drivers/net/sunhme.c2
-rw-r--r--drivers/net/sunlance.c2
-rw-r--r--drivers/net/tehuti.c8
-rw-r--r--drivers/net/tlan.c8
-rw-r--r--drivers/net/tulip/dmfe.c2
-rw-r--r--drivers/net/tulip/uli526x.c2
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/net/wd.c8
-rw-r--r--drivers/net/wireless/ray_cs.c12
-rw-r--r--drivers/net/yellowfin.c2
49 files changed, 118 insertions, 118 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index baac246561b9..4777a1cbcd8d 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -337,10 +337,10 @@ el2_probe1(struct net_device *dev, int ioaddr)
337 /* Finish setting the board's parameters. */ 337 /* Finish setting the board's parameters. */
338 ei_status.stop_page = EL2_MB1_STOP_PG; 338 ei_status.stop_page = EL2_MB1_STOP_PG;
339 ei_status.word16 = wordlength; 339 ei_status.word16 = wordlength;
340 ei_status.reset_8390 = &el2_reset_8390; 340 ei_status.reset_8390 = el2_reset_8390;
341 ei_status.get_8390_hdr = &el2_get_8390_hdr; 341 ei_status.get_8390_hdr = el2_get_8390_hdr;
342 ei_status.block_input = &el2_block_input; 342 ei_status.block_input = el2_block_input;
343 ei_status.block_output = &el2_block_output; 343 ei_status.block_output = el2_block_output;
344 344
345 if (dev->irq == 2) 345 if (dev->irq == 2)
346 dev->irq = 9; 346 dev->irq = 9;
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 3bba835f1a21..8a6eb0c44486 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -734,7 +734,7 @@ static int corkscrew_open(struct net_device *dev)
734 init_timer(&vp->timer); 734 init_timer(&vp->timer);
735 vp->timer.expires = jiffies + media_tbl[dev->if_port].wait; 735 vp->timer.expires = jiffies + media_tbl[dev->if_port].wait;
736 vp->timer.data = (unsigned long) dev; 736 vp->timer.data = (unsigned long) dev;
737 vp->timer.function = &corkscrew_timer; /* timer handler */ 737 vp->timer.function = corkscrew_timer; /* timer handler */
738 add_timer(&vp->timer); 738 add_timer(&vp->timer);
739 } else 739 } else
740 dev->if_port = vp->default_media; 740 dev->if_port = vp->default_media;
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index c754d88e5ec9..7a01588fb6fb 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1738,7 +1738,7 @@ vortex_open(struct net_device *dev)
1738 1738
1739 /* Use the now-standard shared IRQ implementation. */ 1739 /* Use the now-standard shared IRQ implementation. */
1740 if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ? 1740 if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
1741 &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) { 1741 boomerang_interrupt : vortex_interrupt, IRQF_SHARED, dev->name, dev))) {
1742 pr_err("%s: Could not reserve IRQ %d\n", dev->name, dev->irq); 1742 pr_err("%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
1743 goto err; 1743 goto err;
1744 } 1744 }
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 1acea5774e89..1ae44bb26317 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2316,7 +2316,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
2316 netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64); 2316 netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64);
2317 2317
2318 init_timer(&adapter->phy_config_timer); 2318 init_timer(&adapter->phy_config_timer);
2319 adapter->phy_config_timer.function = &atl1e_phy_config; 2319 adapter->phy_config_timer.function = atl1e_phy_config;
2320 adapter->phy_config_timer.data = (unsigned long) adapter; 2320 adapter->phy_config_timer.data = (unsigned long) adapter;
2321 2321
2322 /* get user settings */ 2322 /* get user settings */
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 63b9ba0cc67e..5837b0184d4b 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3036,7 +3036,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
3036 netif_carrier_off(netdev); 3036 netif_carrier_off(netdev);
3037 netif_stop_queue(netdev); 3037 netif_stop_queue(netdev);
3038 3038
3039 setup_timer(&adapter->phy_config_timer, &atl1_phy_config, 3039 setup_timer(&adapter->phy_config_timer, atl1_phy_config,
3040 (unsigned long)adapter); 3040 (unsigned long)adapter);
3041 adapter->phy_timer_pending = false; 3041 adapter->phy_timer_pending = false;
3042 3042
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 8da87383fb39..07adc8446901 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1444,11 +1444,11 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
1444 atl2_check_options(adapter); 1444 atl2_check_options(adapter);
1445 1445
1446 init_timer(&adapter->watchdog_timer); 1446 init_timer(&adapter->watchdog_timer);
1447 adapter->watchdog_timer.function = &atl2_watchdog; 1447 adapter->watchdog_timer.function = atl2_watchdog;
1448 adapter->watchdog_timer.data = (unsigned long) adapter; 1448 adapter->watchdog_timer.data = (unsigned long) adapter;
1449 1449
1450 init_timer(&adapter->phy_config_timer); 1450 init_timer(&adapter->phy_config_timer);
1451 adapter->phy_config_timer.function = &atl2_phy_config; 1451 adapter->phy_config_timer.function = atl2_phy_config;
1452 adapter->phy_config_timer.data = (unsigned long) adapter; 1452 adapter->phy_config_timer.data = (unsigned long) adapter;
1453 1453
1454 INIT_WORK(&adapter->reset_task, atl2_reset_task); 1454 INIT_WORK(&adapter->reset_task, atl2_reset_task);
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index bd2f9d331dac..dfd96b20547f 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -445,7 +445,7 @@ static int net_open(struct net_device *dev)
445 init_timer(&lp->timer); 445 init_timer(&lp->timer);
446 lp->timer.expires = jiffies + TIMED_CHECKER; 446 lp->timer.expires = jiffies + TIMED_CHECKER;
447 lp->timer.data = (unsigned long)dev; 447 lp->timer.data = (unsigned long)dev;
448 lp->timer.function = &atp_timed_checker; /* timer handler */ 448 lp->timer.function = atp_timed_checker; /* timer handler */
449 add_timer(&lp->timer); 449 add_timer(&lp->timer);
450 450
451 netif_start_queue(dev); 451 netif_start_queue(dev);
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index e2f70c3d7be4..ecfef240a303 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -798,7 +798,7 @@ static int bcm_enet_open(struct net_device *dev)
798 snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, 798 snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
799 priv->mac_id ? "1" : "0", priv->phy_id); 799 priv->mac_id ? "1" : "0", priv->phy_id);
800 800
801 phydev = phy_connect(dev, phy_id, &bcm_enet_adjust_phy_link, 0, 801 phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
802 PHY_INTERFACE_MODE_MII); 802 PHY_INTERFACE_MODE_MII);
803 803
804 if (IS_ERR(phydev)) { 804 if (IS_ERR(phydev)) {
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 8e142aaa05d4..5a5af1ca7541 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1175,7 +1175,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
1175 snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, 1175 snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT,
1176 mdio_bus_id, phy_id); 1176 mdio_bus_id, phy_id);
1177 1177
1178 priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0, 1178 priv->phy = phy_connect(dev, priv->phy_name, cpmac_adjust_link, 0,
1179 PHY_INTERFACE_MODE_MII); 1179 PHY_INTERFACE_MODE_MII);
1180 1180
1181 if (IS_ERR(priv->phy)) { 1181 if (IS_ERR(priv->phy)) {
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index d7de376d7178..219eb5ad5c12 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -1255,7 +1255,7 @@ static int __devinit dec_lance_probe(struct device *bdev, const int type)
1255 */ 1255 */
1256 init_timer(&lp->multicast_timer); 1256 init_timer(&lp->multicast_timer);
1257 lp->multicast_timer.data = (unsigned long) dev; 1257 lp->multicast_timer.data = (unsigned long) dev;
1258 lp->multicast_timer.function = &lance_set_multicast_retry; 1258 lp->multicast_timer.function = lance_set_multicast_retry;
1259 1259
1260 ret = register_netdev(dev); 1260 ret = register_netdev(dev);
1261 if (ret) { 1261 if (ret) {
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index a2f238d20caa..e1a8216ff692 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -465,7 +465,7 @@ rio_open (struct net_device *dev)
465 init_timer (&np->timer); 465 init_timer (&np->timer);
466 np->timer.expires = jiffies + 1*HZ; 466 np->timer.expires = jiffies + 1*HZ;
467 np->timer.data = (unsigned long) dev; 467 np->timer.data = (unsigned long) dev;
468 np->timer.function = &rio_timer; 468 np->timer.function = rio_timer;
469 add_timer (&np->timer); 469 add_timer (&np->timer);
470 470
471 /* Start Tx/Rx */ 471 /* Start Tx/Rx */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5cc39ed289c6..3e8ac4baae1b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -962,15 +962,15 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
962 e1000_get_bus_info(hw); 962 e1000_get_bus_info(hw);
963 963
964 init_timer(&adapter->tx_fifo_stall_timer); 964 init_timer(&adapter->tx_fifo_stall_timer);
965 adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall; 965 adapter->tx_fifo_stall_timer.function = e1000_82547_tx_fifo_stall;
966 adapter->tx_fifo_stall_timer.data = (unsigned long)adapter; 966 adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
967 967
968 init_timer(&adapter->watchdog_timer); 968 init_timer(&adapter->watchdog_timer);
969 adapter->watchdog_timer.function = &e1000_watchdog; 969 adapter->watchdog_timer.function = e1000_watchdog;
970 adapter->watchdog_timer.data = (unsigned long) adapter; 970 adapter->watchdog_timer.data = (unsigned long) adapter;
971 971
972 init_timer(&adapter->phy_info_timer); 972 init_timer(&adapter->phy_info_timer);
973 adapter->phy_info_timer.function = &e1000_update_phy_info; 973 adapter->phy_info_timer.function = e1000_update_phy_info;
974 adapter->phy_info_timer.data = (unsigned long)adapter; 974 adapter->phy_info_timer.data = (unsigned long)adapter;
975 975
976 INIT_WORK(&adapter->reset_task, e1000_reset_task); 976 INIT_WORK(&adapter->reset_task, e1000_reset_task);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 2b8ef44bd2b1..5f3eac6432cb 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5745,11 +5745,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
5745 } 5745 }
5746 5746
5747 init_timer(&adapter->watchdog_timer); 5747 init_timer(&adapter->watchdog_timer);
5748 adapter->watchdog_timer.function = &e1000_watchdog; 5748 adapter->watchdog_timer.function = e1000_watchdog;
5749 adapter->watchdog_timer.data = (unsigned long) adapter; 5749 adapter->watchdog_timer.data = (unsigned long) adapter;
5750 5750
5751 init_timer(&adapter->phy_info_timer); 5751 init_timer(&adapter->phy_info_timer);
5752 adapter->phy_info_timer.function = &e1000_update_phy_info; 5752 adapter->phy_info_timer.function = e1000_update_phy_info;
5753 adapter->phy_info_timer.data = (unsigned long) adapter; 5753 adapter->phy_info_timer.data = (unsigned long) adapter;
5754 5754
5755 INIT_WORK(&adapter->reset_task, e1000_reset_task); 5755 INIT_WORK(&adapter->reset_task, e1000_reset_task);
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 2b98ee80fa33..043d99013056 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -3721,7 +3721,7 @@ int __init ehea_module_init(void)
3721 if (ret) 3721 if (ret)
3722 ehea_info("failed registering memory remove notifier"); 3722 ehea_info("failed registering memory remove notifier");
3723 3723
3724 ret = crash_shutdown_register(&ehea_crash_handler); 3724 ret = crash_shutdown_register(ehea_crash_handler);
3725 if (ret) 3725 if (ret)
3726 ehea_info("failed registering crash handler"); 3726 ehea_info("failed registering crash handler");
3727 3727
@@ -3746,7 +3746,7 @@ out3:
3746out2: 3746out2:
3747 unregister_memory_notifier(&ehea_mem_nb); 3747 unregister_memory_notifier(&ehea_mem_nb);
3748 unregister_reboot_notifier(&ehea_reboot_nb); 3748 unregister_reboot_notifier(&ehea_reboot_nb);
3749 crash_shutdown_unregister(&ehea_crash_handler); 3749 crash_shutdown_unregister(ehea_crash_handler);
3750out: 3750out:
3751 return ret; 3751 return ret;
3752} 3752}
@@ -3759,7 +3759,7 @@ static void __exit ehea_module_exit(void)
3759 driver_remove_file(&ehea_driver.driver, &driver_attr_capabilities); 3759 driver_remove_file(&ehea_driver.driver, &driver_attr_capabilities);
3760 ibmebus_unregister_driver(&ehea_driver); 3760 ibmebus_unregister_driver(&ehea_driver);
3761 unregister_reboot_notifier(&ehea_reboot_nb); 3761 unregister_reboot_notifier(&ehea_reboot_nb);
3762 ret = crash_shutdown_unregister(&ehea_crash_handler); 3762 ret = crash_shutdown_unregister(ehea_crash_handler);
3763 if (ret) 3763 if (ret)
3764 ehea_info("failed unregistering crash handler"); 3764 ehea_info("failed unregistering crash handler");
3765 unregister_memory_notifier(&ehea_mem_nb); 3765 unregister_memory_notifier(&ehea_mem_nb);
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 57c8ac0ef3f1..32543a300b81 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -758,7 +758,7 @@ static int epic_open(struct net_device *dev)
758 init_timer(&ep->timer); 758 init_timer(&ep->timer);
759 ep->timer.expires = jiffies + 3*HZ; 759 ep->timer.expires = jiffies + 3*HZ;
760 ep->timer.data = (unsigned long)dev; 760 ep->timer.data = (unsigned long)dev;
761 ep->timer.function = &epic_timer; /* timer handler */ 761 ep->timer.function = epic_timer; /* timer handler */
762 add_timer(&ep->timer); 762 add_timer(&ep->timer);
763 763
764 return 0; 764 return 0;
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index d7e8f6b8f4cf..dd54abe2f710 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -915,14 +915,14 @@ static int netdev_open(struct net_device *dev)
915 init_timer(&np->timer); 915 init_timer(&np->timer);
916 np->timer.expires = RUN_AT(3 * HZ); 916 np->timer.expires = RUN_AT(3 * HZ);
917 np->timer.data = (unsigned long) dev; 917 np->timer.data = (unsigned long) dev;
918 np->timer.function = &netdev_timer; 918 np->timer.function = netdev_timer;
919 919
920 /* timer handler */ 920 /* timer handler */
921 add_timer(&np->timer); 921 add_timer(&np->timer);
922 922
923 init_timer(&np->reset_timer); 923 init_timer(&np->reset_timer);
924 np->reset_timer.data = (unsigned long) dev; 924 np->reset_timer.data = (unsigned long) dev;
925 np->reset_timer.function = &reset_timer; 925 np->reset_timer.function = reset_timer;
926 np->reset_timer_armed = 0; 926 np->reset_timer_armed = 0;
927 927
928 return 0; 928 return 0;
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 4da05b1b445c..6a44fe411589 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5440,13 +5440,13 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
5440 5440
5441 init_timer(&np->oom_kick); 5441 init_timer(&np->oom_kick);
5442 np->oom_kick.data = (unsigned long) dev; 5442 np->oom_kick.data = (unsigned long) dev;
5443 np->oom_kick.function = &nv_do_rx_refill; /* timer handler */ 5443 np->oom_kick.function = nv_do_rx_refill; /* timer handler */
5444 init_timer(&np->nic_poll); 5444 init_timer(&np->nic_poll);
5445 np->nic_poll.data = (unsigned long) dev; 5445 np->nic_poll.data = (unsigned long) dev;
5446 np->nic_poll.function = &nv_do_nic_poll; /* timer handler */ 5446 np->nic_poll.function = nv_do_nic_poll; /* timer handler */
5447 init_timer(&np->stats_poll); 5447 init_timer(&np->stats_poll);
5448 np->stats_poll.data = (unsigned long) dev; 5448 np->stats_poll.data = (unsigned long) dev;
5449 np->stats_poll.function = &nv_do_stats_poll; /* timer handler */ 5449 np->stats_poll.function = nv_do_stats_poll; /* timer handler */
5450 5450
5451 err = pci_enable_device(pci_dev); 5451 err = pci_enable_device(pci_dev);
5452 if (err) 5452 if (err)
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 49aac7027fbb..9a6485892b3d 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1004,7 +1004,7 @@ static int hamachi_open(struct net_device *dev)
1004 init_timer(&hmp->timer); 1004 init_timer(&hmp->timer);
1005 hmp->timer.expires = RUN_AT((24*HZ)/10); /* 2.4 sec. */ 1005 hmp->timer.expires = RUN_AT((24*HZ)/10); /* 2.4 sec. */
1006 hmp->timer.data = (unsigned long)dev; 1006 hmp->timer.data = (unsigned long)dev;
1007 hmp->timer.function = &hamachi_timer; /* timer handler */ 1007 hmp->timer.function = hamachi_timer; /* timer handler */
1008 add_timer(&hmp->timer); 1008 add_timer(&hmp->timer);
1009 1009
1010 return 0; 1010 return 0;
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 86ececd3c658..d15d2f2ba78e 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -204,10 +204,10 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
204 ei_status.rx_start_page = HP_START_PG + TX_PAGES; 204 ei_status.rx_start_page = HP_START_PG + TX_PAGES;
205 ei_status.stop_page = wordmode ? HP_16BSTOP_PG : HP_8BSTOP_PG; 205 ei_status.stop_page = wordmode ? HP_16BSTOP_PG : HP_8BSTOP_PG;
206 206
207 ei_status.reset_8390 = &hp_reset_8390; 207 ei_status.reset_8390 = hp_reset_8390;
208 ei_status.get_8390_hdr = &hp_get_8390_hdr; 208 ei_status.get_8390_hdr = hp_get_8390_hdr;
209 ei_status.block_input = &hp_block_input; 209 ei_status.block_input = hp_block_input;
210 ei_status.block_output = &hp_block_output; 210 ei_status.block_output = hp_block_output;
211 hp_init_card(dev); 211 hp_init_card(dev);
212 212
213 retval = register_netdev(dev); 213 retval = register_netdev(dev);
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index 07d8e5b634f3..376e953c6ce6 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -155,10 +155,10 @@ static int __devinit hydra_init(struct zorro_dev *z)
155 155
156 ei_status.rx_start_page = start_page + TX_PAGES; 156 ei_status.rx_start_page = start_page + TX_PAGES;
157 157
158 ei_status.reset_8390 = &hydra_reset_8390; 158 ei_status.reset_8390 = hydra_reset_8390;
159 ei_status.block_input = &hydra_block_input; 159 ei_status.block_input = hydra_block_input;
160 ei_status.block_output = &hydra_block_output; 160 ei_status.block_output = hydra_block_output;
161 ei_status.get_8390_hdr = &hydra_get_8390_hdr; 161 ei_status.get_8390_hdr = hydra_get_8390_hdr;
162 ei_status.reg_offset = hydra_offsets; 162 ei_status.reg_offset = hydra_offsets;
163 163
164 dev->netdev_ops = &hydra_netdev_ops; 164 dev->netdev_ops = &hydra_netdev_ops;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 985e37cf17b6..d35cc38bf8b2 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1888,9 +1888,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1888 goto err_eeprom; 1888 goto err_eeprom;
1889 } 1889 }
1890 1890
1891 setup_timer(&adapter->watchdog_timer, &igb_watchdog, 1891 setup_timer(&adapter->watchdog_timer, igb_watchdog,
1892 (unsigned long) adapter); 1892 (unsigned long) adapter);
1893 setup_timer(&adapter->phy_info_timer, &igb_update_phy_info, 1893 setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
1894 (unsigned long) adapter); 1894 (unsigned long) adapter);
1895 1895
1896 INIT_WORK(&adapter->reset_task, igb_reset_task); 1896 INIT_WORK(&adapter->reset_task, igb_reset_task);
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 0b3f6df5cff7..c8ee8d28767b 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -827,7 +827,7 @@ static void ioc3_mii_start(struct ioc3_private *ip)
827{ 827{
828 ip->ioc3_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */ 828 ip->ioc3_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */
829 ip->ioc3_timer.data = (unsigned long) ip; 829 ip->ioc3_timer.data = (unsigned long) ip;
830 ip->ioc3_timer.function = &ioc3_timer; 830 ip->ioc3_timer.function = ioc3_timer;
831 add_timer(&ip->ioc3_timer); 831 add_timer(&ip->ioc3_timer);
832} 832}
833 833
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 45fc89b9ba64..33c4ffe6e103 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -470,7 +470,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
470 adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw); 470 adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
471 471
472 init_timer(&adapter->watchdog_timer); 472 init_timer(&adapter->watchdog_timer);
473 adapter->watchdog_timer.function = &ixgb_watchdog; 473 adapter->watchdog_timer.function = ixgb_watchdog;
474 adapter->watchdog_timer.data = (unsigned long)adapter; 474 adapter->watchdog_timer.data = (unsigned long)adapter;
475 475
476 INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task); 476 INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 18163e312a39..5e4dc1b0a1bd 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -6730,7 +6730,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
6730 * which might start the timer 6730 * which might start the timer
6731 */ 6731 */
6732 init_timer(&adapter->sfp_timer); 6732 init_timer(&adapter->sfp_timer);
6733 adapter->sfp_timer.function = &ixgbe_sfp_timer; 6733 adapter->sfp_timer.function = ixgbe_sfp_timer;
6734 adapter->sfp_timer.data = (unsigned long) adapter; 6734 adapter->sfp_timer.data = (unsigned long) adapter;
6735 6735
6736 INIT_WORK(&adapter->sfp_task, ixgbe_sfp_task); 6736 INIT_WORK(&adapter->sfp_task, ixgbe_sfp_task);
@@ -6862,7 +6862,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
6862 hw->mac.ops.disable_tx_laser(hw); 6862 hw->mac.ops.disable_tx_laser(hw);
6863 6863
6864 init_timer(&adapter->watchdog_timer); 6864 init_timer(&adapter->watchdog_timer);
6865 adapter->watchdog_timer.function = &ixgbe_watchdog; 6865 adapter->watchdog_timer.function = ixgbe_watchdog;
6866 adapter->watchdog_timer.data = (unsigned long)adapter; 6866 adapter->watchdog_timer.data = (unsigned long)adapter;
6867 6867
6868 INIT_WORK(&adapter->reset_task, ixgbe_reset_task); 6868 INIT_WORK(&adapter->reset_task, ixgbe_reset_task);
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 918c00359b0a..5d3c869283a5 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -3426,7 +3426,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
3426 } 3426 }
3427 3427
3428 init_timer(&adapter->watchdog_timer); 3428 init_timer(&adapter->watchdog_timer);
3429 adapter->watchdog_timer.function = &ixgbevf_watchdog; 3429 adapter->watchdog_timer.function = ixgbevf_watchdog;
3430 adapter->watchdog_timer.data = (unsigned long)adapter; 3430 adapter->watchdog_timer.data = (unsigned long)adapter;
3431 3431
3432 INIT_WORK(&adapter->reset_task, ixgbevf_reset_task); 3432 INIT_WORK(&adapter->reset_task, ixgbevf_reset_task);
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 3832fa4961dd..f84f5e6ededb 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -562,19 +562,19 @@ static int __init mac8390_initdev(struct net_device *dev,
562 562
563 case ACCESS_16: 563 case ACCESS_16:
564 /* 16 bit card, register map is reversed */ 564 /* 16 bit card, register map is reversed */
565 ei_status.reset_8390 = &mac8390_no_reset; 565 ei_status.reset_8390 = mac8390_no_reset;
566 ei_status.block_input = &slow_sane_block_input; 566 ei_status.block_input = slow_sane_block_input;
567 ei_status.block_output = &slow_sane_block_output; 567 ei_status.block_output = slow_sane_block_output;
568 ei_status.get_8390_hdr = &slow_sane_get_8390_hdr; 568 ei_status.get_8390_hdr = slow_sane_get_8390_hdr;
569 ei_status.reg_offset = back4_offsets; 569 ei_status.reg_offset = back4_offsets;
570 break; 570 break;
571 571
572 case ACCESS_32: 572 case ACCESS_32:
573 /* 32 bit card, register map is reversed */ 573 /* 32 bit card, register map is reversed */
574 ei_status.reset_8390 = &mac8390_no_reset; 574 ei_status.reset_8390 = mac8390_no_reset;
575 ei_status.block_input = &sane_block_input; 575 ei_status.block_input = sane_block_input;
576 ei_status.block_output = &sane_block_output; 576 ei_status.block_output = sane_block_output;
577 ei_status.get_8390_hdr = &sane_get_8390_hdr; 577 ei_status.get_8390_hdr = sane_get_8390_hdr;
578 ei_status.reg_offset = back4_offsets; 578 ei_status.reg_offset = back4_offsets;
579 access_bitmode = 1; 579 access_bitmode = 1;
580 break; 580 break;
@@ -586,19 +586,19 @@ static int __init mac8390_initdev(struct net_device *dev,
586 * but overwrite system memory when run at 32 bit. 586 * but overwrite system memory when run at 32 bit.
587 * so we run them all at 16 bit. 587 * so we run them all at 16 bit.
588 */ 588 */
589 ei_status.reset_8390 = &mac8390_no_reset; 589 ei_status.reset_8390 = mac8390_no_reset;
590 ei_status.block_input = &slow_sane_block_input; 590 ei_status.block_input = slow_sane_block_input;
591 ei_status.block_output = &slow_sane_block_output; 591 ei_status.block_output = slow_sane_block_output;
592 ei_status.get_8390_hdr = &slow_sane_get_8390_hdr; 592 ei_status.get_8390_hdr = slow_sane_get_8390_hdr;
593 ei_status.reg_offset = back4_offsets; 593 ei_status.reg_offset = back4_offsets;
594 break; 594 break;
595 595
596 case MAC8390_CABLETRON: 596 case MAC8390_CABLETRON:
597 /* 16 bit card, register map is short forward */ 597 /* 16 bit card, register map is short forward */
598 ei_status.reset_8390 = &mac8390_no_reset; 598 ei_status.reset_8390 = mac8390_no_reset;
599 ei_status.block_input = &slow_sane_block_input; 599 ei_status.block_input = slow_sane_block_input;
600 ei_status.block_output = &slow_sane_block_output; 600 ei_status.block_output = slow_sane_block_output;
601 ei_status.get_8390_hdr = &slow_sane_get_8390_hdr; 601 ei_status.get_8390_hdr = slow_sane_get_8390_hdr;
602 ei_status.reg_offset = fwrd2_offsets; 602 ei_status.reg_offset = fwrd2_offsets;
603 break; 603 break;
604 604
@@ -606,19 +606,19 @@ static int __init mac8390_initdev(struct net_device *dev,
606 case MAC8390_KINETICS: 606 case MAC8390_KINETICS:
607 /* 16 bit memory, register map is forward */ 607 /* 16 bit memory, register map is forward */
608 /* dayna and similar */ 608 /* dayna and similar */
609 ei_status.reset_8390 = &mac8390_no_reset; 609 ei_status.reset_8390 = mac8390_no_reset;
610 ei_status.block_input = &dayna_block_input; 610 ei_status.block_input = dayna_block_input;
611 ei_status.block_output = &dayna_block_output; 611 ei_status.block_output = dayna_block_output;
612 ei_status.get_8390_hdr = &dayna_get_8390_hdr; 612 ei_status.get_8390_hdr = dayna_get_8390_hdr;
613 ei_status.reg_offset = fwrd4_offsets; 613 ei_status.reg_offset = fwrd4_offsets;
614 break; 614 break;
615 615
616 case MAC8390_INTERLAN: 616 case MAC8390_INTERLAN:
617 /* 16 bit memory, register map is forward */ 617 /* 16 bit memory, register map is forward */
618 ei_status.reset_8390 = &interlan_reset; 618 ei_status.reset_8390 = interlan_reset;
619 ei_status.block_input = &slow_sane_block_input; 619 ei_status.block_input = slow_sane_block_input;
620 ei_status.block_output = &slow_sane_block_output; 620 ei_status.block_output = slow_sane_block_output;
621 ei_status.get_8390_hdr = &slow_sane_get_8390_hdr; 621 ei_status.get_8390_hdr = slow_sane_get_8390_hdr;
622 ei_status.reg_offset = fwrd4_offsets; 622 ei_status.reg_offset = fwrd4_offsets;
623 break; 623 break;
624 624
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index a6033d48b5cc..2fd39630b1e5 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -1570,7 +1570,7 @@ static int netdev_open(struct net_device *dev)
1570 init_timer(&np->timer); 1570 init_timer(&np->timer);
1571 np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ); 1571 np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
1572 np->timer.data = (unsigned long)dev; 1572 np->timer.data = (unsigned long)dev;
1573 np->timer.function = &netdev_timer; /* timer handler */ 1573 np->timer.function = netdev_timer; /* timer handler */
1574 add_timer(&np->timer); 1574 add_timer(&np->timer);
1575 1575
1576 return 0; 1576 return 0;
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 56f3fc45dbaa..8dd03439d994 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -1125,7 +1125,7 @@ static int netdrv_open(struct net_device *dev)
1125 init_timer(&tp->timer); 1125 init_timer(&tp->timer);
1126 tp->timer.expires = jiffies + 3 * HZ; 1126 tp->timer.expires = jiffies + 3 * HZ;
1127 tp->timer.data = (unsigned long) dev; 1127 tp->timer.data = (unsigned long) dev;
1128 tp->timer.function = &netdrv_timer; 1128 tp->timer.function = netdrv_timer;
1129 add_timer(&tp->timer); 1129 add_timer(&tp->timer);
1130 1130
1131 DPRINTK("EXIT, returning 0\n"); 1131 DPRINTK("EXIT, returning 0\n");
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 9b319be7f1d2..042f6777e6b9 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -707,7 +707,7 @@ static int el3_open(struct net_device *dev)
707 netif_start_queue(dev); 707 netif_start_queue(dev);
708 708
709 tc574_reset(dev); 709 tc574_reset(dev);
710 lp->media.function = &media_check; 710 lp->media.function = media_check;
711 lp->media.data = (unsigned long) dev; 711 lp->media.data = (unsigned long) dev;
712 lp->media.expires = jiffies + HZ; 712 lp->media.expires = jiffies + HZ;
713 add_timer(&lp->media); 713 add_timer(&lp->media);
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 1c534f392474..7f2baf5eae26 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -538,7 +538,7 @@ static int el3_open(struct net_device *dev)
538 538
539 tc589_reset(dev); 539 tc589_reset(dev);
540 init_timer(&lp->media); 540 init_timer(&lp->media);
541 lp->media.function = &media_check; 541 lp->media.function = media_check;
542 lp->media.data = (unsigned long) dev; 542 lp->media.data = (unsigned long) dev;
543 lp->media.expires = jiffies + HZ; 543 lp->media.expires = jiffies + HZ;
544 add_timer(&lp->media); 544 add_timer(&lp->media);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index e97f1519a15f..3f61fde70d73 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -356,10 +356,10 @@ static int axnet_config(struct pcmcia_device *link)
356 ei_status.tx_start_page = AXNET_START_PG; 356 ei_status.tx_start_page = AXNET_START_PG;
357 ei_status.rx_start_page = AXNET_START_PG + TX_PAGES; 357 ei_status.rx_start_page = AXNET_START_PG + TX_PAGES;
358 ei_status.stop_page = AXNET_STOP_PG; 358 ei_status.stop_page = AXNET_STOP_PG;
359 ei_status.reset_8390 = &axnet_reset_8390; 359 ei_status.reset_8390 = axnet_reset_8390;
360 ei_status.get_8390_hdr = &get_8390_hdr; 360 ei_status.get_8390_hdr = get_8390_hdr;
361 ei_status.block_input = &block_input; 361 ei_status.block_input = block_input;
362 ei_status.block_output = &block_output; 362 ei_status.block_output = block_output;
363 363
364 if (inb(dev->base_addr + AXNET_TEST) != 0) 364 if (inb(dev->base_addr + AXNET_TEST) != 0)
365 info->flags |= IS_AX88790; 365 info->flags |= IS_AX88790;
@@ -530,7 +530,7 @@ static int axnet_open(struct net_device *dev)
530 530
531 info->link_status = 0x00; 531 info->link_status = 0x00;
532 init_timer(&info->watchdog); 532 init_timer(&info->watchdog);
533 info->watchdog.function = &ei_watchdog; 533 info->watchdog.function = ei_watchdog;
534 info->watchdog.data = (u_long)dev; 534 info->watchdog.data = (u_long)dev;
535 info->watchdog.expires = jiffies + HZ; 535 info->watchdog.expires = jiffies + HZ;
536 add_timer(&info->watchdog); 536 add_timer(&info->watchdog);
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 1815b2644b96..5ad42e0aee25 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -624,7 +624,7 @@ static int pcnet_config(struct pcmcia_device *link)
624 624
625 ei_status.name = "NE2000"; 625 ei_status.name = "NE2000";
626 ei_status.word16 = 1; 626 ei_status.word16 = 1;
627 ei_status.reset_8390 = &pcnet_reset_8390; 627 ei_status.reset_8390 = pcnet_reset_8390;
628 628
629 if (info->flags & (IS_DL10019|IS_DL10022)) 629 if (info->flags & (IS_DL10019|IS_DL10022))
630 mii_phy_probe(dev); 630 mii_phy_probe(dev);
@@ -957,7 +957,7 @@ static int pcnet_open(struct net_device *dev)
957 info->phy_id = info->eth_phy; 957 info->phy_id = info->eth_phy;
958 info->link_status = 0x00; 958 info->link_status = 0x00;
959 init_timer(&info->watchdog); 959 init_timer(&info->watchdog);
960 info->watchdog.function = &ei_watchdog; 960 info->watchdog.function = ei_watchdog;
961 info->watchdog.data = (u_long)dev; 961 info->watchdog.data = (u_long)dev;
962 info->watchdog.expires = jiffies + HZ; 962 info->watchdog.expires = jiffies + HZ;
963 add_timer(&info->watchdog); 963 add_timer(&info->watchdog);
@@ -1341,9 +1341,9 @@ static int setup_dma_config(struct pcmcia_device *link, int start_pg,
1341 ei_status.stop_page = stop_pg; 1341 ei_status.stop_page = stop_pg;
1342 1342
1343 /* set up block i/o functions */ 1343 /* set up block i/o functions */
1344 ei_status.get_8390_hdr = &dma_get_8390_hdr; 1344 ei_status.get_8390_hdr = dma_get_8390_hdr;
1345 ei_status.block_input = &dma_block_input; 1345 ei_status.block_input = dma_block_input;
1346 ei_status.block_output = &dma_block_output; 1346 ei_status.block_output = dma_block_output;
1347 1347
1348 return 0; 1348 return 0;
1349} 1349}
@@ -1489,9 +1489,9 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
1489 ei_status.stop_page = start_pg + ((req.Size - offset) >> 8); 1489 ei_status.stop_page = start_pg + ((req.Size - offset) >> 8);
1490 1490
1491 /* set up block i/o functions */ 1491 /* set up block i/o functions */
1492 ei_status.get_8390_hdr = &shmem_get_8390_hdr; 1492 ei_status.get_8390_hdr = shmem_get_8390_hdr;
1493 ei_status.block_input = &shmem_block_input; 1493 ei_status.block_input = shmem_block_input;
1494 ei_status.block_output = &shmem_block_output; 1494 ei_status.block_output = shmem_block_output;
1495 1495
1496 info->flags |= USE_SHMEM; 1496 info->flags |= USE_SHMEM;
1497 return 0; 1497 return 0;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index cc7a357feac9..3d1c549b7038 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -296,7 +296,7 @@ static const struct net_device_ops smc_netdev_ops = {
296 .ndo_tx_timeout = smc_tx_timeout, 296 .ndo_tx_timeout = smc_tx_timeout,
297 .ndo_set_config = s9k_config, 297 .ndo_set_config = s9k_config,
298 .ndo_set_multicast_list = set_rx_mode, 298 .ndo_set_multicast_list = set_rx_mode,
299 .ndo_do_ioctl = &smc_ioctl, 299 .ndo_do_ioctl = smc_ioctl,
300 .ndo_change_mtu = eth_change_mtu, 300 .ndo_change_mtu = eth_change_mtu,
301 .ndo_set_mac_address = eth_mac_addr, 301 .ndo_set_mac_address = eth_mac_addr,
302 .ndo_validate_addr = eth_validate_addr, 302 .ndo_validate_addr = eth_validate_addr,
@@ -1117,7 +1117,7 @@ static int smc_open(struct net_device *dev)
1117 1117
1118 smc_reset(dev); 1118 smc_reset(dev);
1119 init_timer(&smc->media); 1119 init_timer(&smc->media);
1120 smc->media.function = &media_check; 1120 smc->media.function = media_check;
1121 smc->media.data = (u_long) dev; 1121 smc->media.data = (u_long) dev;
1122 smc->media.expires = jiffies + HZ; 1122 smc->media.expires = jiffies + HZ;
1123 add_timer(&smc->media); 1123 add_timer(&smc->media);
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index e26e107f93e0..e68c941926f1 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1245,7 +1245,7 @@ static int rr_open(struct net_device *dev)
1245 init_timer(&rrpriv->timer); 1245 init_timer(&rrpriv->timer);
1246 rrpriv->timer.expires = RUN_AT(5*HZ); /* 5 sec. watchdog */ 1246 rrpriv->timer.expires = RUN_AT(5*HZ); /* 5 sec. watchdog */
1247 rrpriv->timer.data = (unsigned long)dev; 1247 rrpriv->timer.data = (unsigned long)dev;
1248 rrpriv->timer.function = &rr_timer; /* timer handler */ 1248 rrpriv->timer.function = rr_timer; /* timer handler */
1249 add_timer(&rrpriv->timer); 1249 add_timer(&rrpriv->timer);
1250 1250
1251 netif_start_queue(dev); 1251 netif_start_queue(dev);
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 79fd02bc69fd..a812efc3632e 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1031,7 +1031,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
1031 mdp->duplex = -1; 1031 mdp->duplex = -1;
1032 1032
1033 /* Try connect to PHY */ 1033 /* Try connect to PHY */
1034 phydev = phy_connect(ndev, phy_id, &sh_eth_adjust_link, 1034 phydev = phy_connect(ndev, phy_id, sh_eth_adjust_link,
1035 0, PHY_INTERFACE_MODE_MII); 1035 0, PHY_INTERFACE_MODE_MII);
1036 if (IS_ERR(phydev)) { 1036 if (IS_ERR(phydev)) {
1037 dev_err(&ndev->dev, "phy_connect failed\n"); 1037 dev_err(&ndev->dev, "phy_connect failed\n");
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index bbbded76ff14..ffdd8591d4bc 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1042,7 +1042,7 @@ sis900_open(struct net_device *net_dev)
1042 init_timer(&sis_priv->timer); 1042 init_timer(&sis_priv->timer);
1043 sis_priv->timer.expires = jiffies + HZ; 1043 sis_priv->timer.expires = jiffies + HZ;
1044 sis_priv->timer.data = (unsigned long)net_dev; 1044 sis_priv->timer.data = (unsigned long)net_dev;
1045 sis_priv->timer.function = &sis900_timer; 1045 sis_priv->timer.function = sis900_timer;
1046 add_timer(&sis_priv->timer); 1046 add_timer(&sis_priv->timer);
1047 1047
1048 return 0; 1048 return 0;
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 618643e3ca3e..0a6a5ced3c1c 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -617,7 +617,7 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)
617 bp->timer_ticks = 0; 617 bp->timer_ticks = 0;
618 bp->bigmac_timer.expires = jiffies + (12 * HZ) / 10; 618 bp->bigmac_timer.expires = jiffies + (12 * HZ) / 10;
619 bp->bigmac_timer.data = (unsigned long) bp; 619 bp->bigmac_timer.data = (unsigned long) bp;
620 bp->bigmac_timer.function = &bigmac_timer; 620 bp->bigmac_timer.function = bigmac_timer;
621 add_timer(&bp->bigmac_timer); 621 add_timer(&bp->bigmac_timer);
622} 622}
623 623
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 2678588ea4b2..3fa949789b42 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -874,7 +874,7 @@ static int netdev_open(struct net_device *dev)
874 init_timer(&np->timer); 874 init_timer(&np->timer);
875 np->timer.expires = jiffies + 3*HZ; 875 np->timer.expires = jiffies + 3*HZ;
876 np->timer.data = (unsigned long)dev; 876 np->timer.data = (unsigned long)dev;
877 np->timer.function = &netdev_timer; /* timer handler */ 877 np->timer.function = netdev_timer; /* timer handler */
878 add_timer(&np->timer); 878 add_timer(&np->timer);
879 879
880 /* Enable interrupts by setting the interrupt mask. */ 880 /* Enable interrupts by setting the interrupt mask. */
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index d96431eb698b..45f315ed1868 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -1409,7 +1409,7 @@ force_link:
1409 hp->timer_ticks = 0; 1409 hp->timer_ticks = 0;
1410 hp->happy_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */ 1410 hp->happy_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */
1411 hp->happy_timer.data = (unsigned long) hp; 1411 hp->happy_timer.data = (unsigned long) hp;
1412 hp->happy_timer.function = &happy_meal_timer; 1412 hp->happy_timer.function = happy_meal_timer;
1413 add_timer(&hp->happy_timer); 1413 add_timer(&hp->happy_timer);
1414} 1414}
1415 1415
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 8dcb858f2168..2cf84e5968b2 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1483,7 +1483,7 @@ no_link_test:
1483 */ 1483 */
1484 init_timer(&lp->multicast_timer); 1484 init_timer(&lp->multicast_timer);
1485 lp->multicast_timer.data = (unsigned long) dev; 1485 lp->multicast_timer.data = (unsigned long) dev;
1486 lp->multicast_timer.function = &lance_set_multicast_retry; 1486 lp->multicast_timer.function = lance_set_multicast_retry;
1487 1487
1488 if (register_netdev(dev)) { 1488 if (register_netdev(dev)) {
1489 printk(KERN_ERR "SunLance: Cannot register device.\n"); 1489 printk(KERN_ERR "SunLance: Cannot register device.\n");
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index d808f95a87ca..3128d6a8e9ce 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -92,7 +92,7 @@ static void bdx_rx_free(struct bdx_priv *priv);
92static void bdx_tx_free(struct bdx_priv *priv); 92static void bdx_tx_free(struct bdx_priv *priv);
93 93
94/* Definitions needed by bdx_probe */ 94/* Definitions needed by bdx_probe */
95static void bdx_ethtool_ops(struct net_device *netdev); 95static void bdx_set_ethtool_ops(struct net_device *netdev);
96 96
97/************************************************************************* 97/*************************************************************************
98 * Print Info * 98 * Print Info *
@@ -2005,7 +2005,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2005 ndev->netdev_ops = &bdx_netdev_ops; 2005 ndev->netdev_ops = &bdx_netdev_ops;
2006 ndev->tx_queue_len = BDX_NDEV_TXQ_LEN; 2006 ndev->tx_queue_len = BDX_NDEV_TXQ_LEN;
2007 2007
2008 bdx_ethtool_ops(ndev); /* ethtool interface */ 2008 bdx_set_ethtool_ops(ndev); /* ethtool interface */
2009 2009
2010 /* these fields are used for info purposes only 2010 /* these fields are used for info purposes only
2011 * so we can have them same for all ports of the board */ 2011 * so we can have them same for all ports of the board */
@@ -2410,10 +2410,10 @@ static void bdx_get_ethtool_stats(struct net_device *netdev,
2410} 2410}
2411 2411
2412/* 2412/*
2413 * bdx_ethtool_ops - ethtool interface implementation 2413 * bdx_set_ethtool_ops - ethtool interface implementation
2414 * @netdev 2414 * @netdev
2415 */ 2415 */
2416static void bdx_ethtool_ops(struct net_device *netdev) 2416static void bdx_set_ethtool_ops(struct net_device *netdev)
2417{ 2417{
2418 static const struct ethtool_ops bdx_ethtool_ops = { 2418 static const struct ethtool_ops bdx_ethtool_ops = {
2419 .get_settings = bdx_get_settings, 2419 .get_settings = bdx_get_settings,
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index ccee3eddc5f4..0564ca05963d 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -393,7 +393,7 @@ TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
393 spin_unlock_irqrestore(&priv->lock, flags); 393 spin_unlock_irqrestore(&priv->lock, flags);
394 return; 394 return;
395 } 395 }
396 priv->timer.function = &TLan_Timer; 396 priv->timer.function = TLan_Timer;
397 if (!in_irq()) 397 if (!in_irq())
398 spin_unlock_irqrestore(&priv->lock, flags); 398 spin_unlock_irqrestore(&priv->lock, flags);
399 399
@@ -1453,7 +1453,7 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
1453 TLan_DioWrite8( dev->base_addr, 1453 TLan_DioWrite8( dev->base_addr,
1454 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); 1454 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
1455 if ( priv->timer.function == NULL ) { 1455 if ( priv->timer.function == NULL ) {
1456 priv->timer.function = &TLan_Timer; 1456 priv->timer.function = TLan_Timer;
1457 priv->timer.data = (unsigned long) dev; 1457 priv->timer.data = (unsigned long) dev;
1458 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; 1458 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
1459 priv->timerSetAt = jiffies; 1459 priv->timerSetAt = jiffies;
@@ -1601,7 +1601,7 @@ drop_and_reuse:
1601 TLan_DioWrite8( dev->base_addr, 1601 TLan_DioWrite8( dev->base_addr,
1602 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); 1602 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
1603 if ( priv->timer.function == NULL ) { 1603 if ( priv->timer.function == NULL ) {
1604 priv->timer.function = &TLan_Timer; 1604 priv->timer.function = TLan_Timer;
1605 priv->timer.data = (unsigned long) dev; 1605 priv->timer.data = (unsigned long) dev;
1606 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; 1606 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
1607 priv->timerSetAt = jiffies; 1607 priv->timerSetAt = jiffies;
@@ -1897,7 +1897,7 @@ static void TLan_Timer( unsigned long data )
1897 TLan_DioWrite8( dev->base_addr, 1897 TLan_DioWrite8( dev->base_addr,
1898 TLAN_LED_REG, TLAN_LED_LINK ); 1898 TLAN_LED_REG, TLAN_LED_LINK );
1899 } else { 1899 } else {
1900 priv->timer.function = &TLan_Timer; 1900 priv->timer.function = TLan_Timer;
1901 priv->timer.expires = priv->timerSetAt 1901 priv->timer.expires = priv->timerSetAt
1902 + TLAN_TIMER_ACT_DELAY; 1902 + TLAN_TIMER_ACT_DELAY;
1903 spin_unlock_irqrestore(&priv->lock, flags); 1903 spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 0bc4f3030a80..a9f7d5d1a269 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -599,7 +599,7 @@ static int dmfe_open(struct DEVICE *dev)
599 init_timer(&db->timer); 599 init_timer(&db->timer);
600 db->timer.expires = DMFE_TIMER_WUT + HZ * 2; 600 db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
601 db->timer.data = (unsigned long)dev; 601 db->timer.data = (unsigned long)dev;
602 db->timer.function = &dmfe_timer; 602 db->timer.function = dmfe_timer;
603 add_timer(&db->timer); 603 add_timer(&db->timer);
604 604
605 return 0; 605 return 0;
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 96de5829b940..1dc27a557275 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -480,7 +480,7 @@ static int uli526x_open(struct net_device *dev)
480 init_timer(&db->timer); 480 init_timer(&db->timer);
481 db->timer.expires = ULI526X_TIMER_WUT + HZ * 2; 481 db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
482 db->timer.data = (unsigned long)dev; 482 db->timer.data = (unsigned long)dev;
483 db->timer.function = &uli526x_timer; 483 db->timer.function = uli526x_timer;
484 add_timer(&db->timer); 484 add_timer(&db->timer);
485 485
486 return 0; 486 return 0;
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 66d41cf8da29..f0b231035dee 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -662,7 +662,7 @@ static int netdev_open(struct net_device *dev)
662 init_timer(&np->timer); 662 init_timer(&np->timer);
663 np->timer.expires = jiffies + 1*HZ; 663 np->timer.expires = jiffies + 1*HZ;
664 np->timer.data = (unsigned long)dev; 664 np->timer.data = (unsigned long)dev;
665 np->timer.function = &netdev_timer; /* timer handler */ 665 np->timer.function = netdev_timer; /* timer handler */
666 add_timer(&np->timer); 666 add_timer(&np->timer);
667 return 0; 667 return 0;
668out_err: 668out_err:
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index e2c6f7f4f51c..43af85b8e45e 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1105,7 +1105,7 @@ static int lmc_open(struct net_device *dev)
1105 init_timer (&sc->timer); 1105 init_timer (&sc->timer);
1106 sc->timer.expires = jiffies + HZ; 1106 sc->timer.expires = jiffies + HZ;
1107 sc->timer.data = (unsigned long) dev; 1107 sc->timer.data = (unsigned long) dev;
1108 sc->timer.function = &lmc_watchdog; 1108 sc->timer.function = lmc_watchdog;
1109 add_timer (&sc->timer); 1109 add_timer (&sc->timer);
1110 1110
1111 lmc_trace(dev, "lmc_open out"); 1111 lmc_trace(dev, "lmc_open out");
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index eb72c67699ab..f1549fff0edc 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -342,10 +342,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
342 printk(" %s, IRQ %d, shared memory at %#lx-%#lx.\n", 342 printk(" %s, IRQ %d, shared memory at %#lx-%#lx.\n",
343 model_name, dev->irq, dev->mem_start, dev->mem_end-1); 343 model_name, dev->irq, dev->mem_start, dev->mem_end-1);
344 344
345 ei_status.reset_8390 = &wd_reset_8390; 345 ei_status.reset_8390 = wd_reset_8390;
346 ei_status.block_input = &wd_block_input; 346 ei_status.block_input = wd_block_input;
347 ei_status.block_output = &wd_block_output; 347 ei_status.block_output = wd_block_output;
348 ei_status.get_8390_hdr = &wd_get_8390_hdr; 348 ei_status.get_8390_hdr = wd_get_8390_hdr;
349 349
350 dev->netdev_ops = &wd_netdev_ops; 350 dev->netdev_ops = &wd_netdev_ops;
351 NS8390_init(dev, 0); 351 NS8390_init(dev, 0);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 3bd9cf76517d..d91a831a7700 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -604,7 +604,7 @@ static int dl_startup_params(struct net_device *dev)
604 /* Start kernel timer to wait for dl startup to complete. */ 604 /* Start kernel timer to wait for dl startup to complete. */
605 local->timer.expires = jiffies + HZ / 2; 605 local->timer.expires = jiffies + HZ / 2;
606 local->timer.data = (long)local; 606 local->timer.data = (long)local;
607 local->timer.function = &verify_dl_startup; 607 local->timer.function = verify_dl_startup;
608 add_timer(&local->timer); 608 add_timer(&local->timer);
609 dev_dbg(&link->dev, 609 dev_dbg(&link->dev,
610 "ray_cs dl_startup_params started timer for verify_dl_startup\n"); 610 "ray_cs dl_startup_params started timer for verify_dl_startup\n");
@@ -1981,12 +1981,12 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
1981 dev_dbg(&link->dev, 1981 dev_dbg(&link->dev,
1982 "ray_cs interrupt network \"%s\" start failed\n", 1982 "ray_cs interrupt network \"%s\" start failed\n",
1983 local->sparm.b4.a_current_ess_id); 1983 local->sparm.b4.a_current_ess_id);
1984 local->timer.function = &start_net; 1984 local->timer.function = start_net;
1985 } else { 1985 } else {
1986 dev_dbg(&link->dev, 1986 dev_dbg(&link->dev,
1987 "ray_cs interrupt network \"%s\" join failed\n", 1987 "ray_cs interrupt network \"%s\" join failed\n",
1988 local->sparm.b4.a_current_ess_id); 1988 local->sparm.b4.a_current_ess_id);
1989 local->timer.function = &join_net; 1989 local->timer.function = join_net;
1990 } 1990 }
1991 add_timer(&local->timer); 1991 add_timer(&local->timer);
1992 } 1992 }
@@ -2454,9 +2454,9 @@ static void authenticate(ray_dev_t *local)
2454 2454
2455 del_timer(&local->timer); 2455 del_timer(&local->timer);
2456 if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) { 2456 if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) {
2457 local->timer.function = &join_net; 2457 local->timer.function = join_net;
2458 } else { 2458 } else {
2459 local->timer.function = &authenticate_timeout; 2459 local->timer.function = authenticate_timeout;
2460 } 2460 }
2461 local->timer.expires = jiffies + HZ * 2; 2461 local->timer.expires = jiffies + HZ * 2;
2462 local->timer.data = (long)local; 2462 local->timer.data = (long)local;
@@ -2541,7 +2541,7 @@ static void associate(ray_dev_t *local)
2541 del_timer(&local->timer); 2541 del_timer(&local->timer);
2542 local->timer.expires = jiffies + HZ * 2; 2542 local->timer.expires = jiffies + HZ * 2;
2543 local->timer.data = (long)local; 2543 local->timer.data = (long)local;
2544 local->timer.function = &join_net; 2544 local->timer.function = join_net;
2545 add_timer(&local->timer); 2545 add_timer(&local->timer);
2546 local->card_status = CARD_ASSOC_FAILED; 2546 local->card_status = CARD_ASSOC_FAILED;
2547 return; 2547 return;
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 4eb67aed68dd..cd1b3dcd61db 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -646,7 +646,7 @@ static int yellowfin_open(struct net_device *dev)
646 init_timer(&yp->timer); 646 init_timer(&yp->timer);
647 yp->timer.expires = jiffies + 3*HZ; 647 yp->timer.expires = jiffies + 3*HZ;
648 yp->timer.data = (unsigned long)dev; 648 yp->timer.data = (unsigned long)dev;
649 yp->timer.function = &yellowfin_timer; /* timer handler */ 649 yp->timer.function = yellowfin_timer; /* timer handler */
650 add_timer(&yp->timer); 650 add_timer(&yp->timer);
651 651
652 return 0; 652 return 0;