aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-09-17 16:11:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:13 -0400
commit10d024c1b2fd58af8362670d7d6e5ae52fc33353 (patch)
treedbfb03c539986e2c1270385eb0083aaf0dfca8ab /drivers/net
parent596c5c97431eab8465739c169401ea611127b9ad (diff)
[NET]: Nuke SET_MODULE_OWNER macro.
It's been a useless no-op for long enough in 2.6 so I figured it's time to remove it. The number of people that could object because they're maintaining unified 2.4 and 2.6 drivers is probably rather small. [ Handled drivers added by netdev tree and some missed IRDA cases... -DaveM ] Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c501.c2
-rw-r--r--drivers/net/3c503.c2
-rw-r--r--drivers/net/3c505.c2
-rw-r--r--drivers/net/3c507.c2
-rw-r--r--drivers/net/3c509.c6
-rw-r--r--drivers/net/3c515.c2
-rw-r--r--drivers/net/3c523.c1
-rw-r--r--drivers/net/3c527.c2
-rw-r--r--drivers/net/3c59x.c1
-rw-r--r--drivers/net/8139cp.c1
-rw-r--r--drivers/net/8139too.c1
-rw-r--r--drivers/net/82596.c1
-rw-r--r--drivers/net/a2065.c1
-rw-r--r--drivers/net/ac3200.c2
-rw-r--r--drivers/net/acenic.c1
-rw-r--r--drivers/net/amd8111e.c1
-rw-r--r--drivers/net/apne.c1
-rw-r--r--drivers/net/appletalk/cops.c2
-rw-r--r--drivers/net/appletalk/ipddp.c1
-rw-r--r--drivers/net/appletalk/ltpc.c2
-rw-r--r--drivers/net/arcnet/com90io.c2
-rw-r--r--drivers/net/ariadne.c1
-rw-r--r--drivers/net/arm/at91_ether.c1
-rw-r--r--drivers/net/arm/ether1.c1
-rw-r--r--drivers/net/arm/ether3.c1
-rw-r--r--drivers/net/arm/etherh.c1
-rw-r--r--drivers/net/at1700.c2
-rw-r--r--drivers/net/atarilance.c1
-rw-r--r--drivers/net/atl1/atl1_main.c1
-rw-r--r--drivers/net/atp.c1
-rw-r--r--drivers/net/b44.c1
-rw-r--r--drivers/net/bfin_mac.c1
-rw-r--r--drivers/net/bmac.c1
-rw-r--r--drivers/net/bnx2.c1
-rw-r--r--drivers/net/bonding/bond_main.c2
-rw-r--r--drivers/net/cassini.c1
-rw-r--r--drivers/net/chelsio/cxgb2.c1
-rw-r--r--drivers/net/cs89x0.c1
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c1
-rw-r--r--drivers/net/de600.c1
-rw-r--r--drivers/net/de620.c2
-rw-r--r--drivers/net/defxx.c1
-rw-r--r--drivers/net/dgrs.c2
-rw-r--r--drivers/net/dl2k.c1
-rw-r--r--drivers/net/dm9000.c1
-rw-r--r--drivers/net/dummy.c1
-rw-r--r--drivers/net/e100.c1
-rw-r--r--drivers/net/e1000/e1000_main.c1
-rw-r--r--drivers/net/e1000e/netdev.c1
-rw-r--r--drivers/net/e2100.c2
-rw-r--r--drivers/net/eepro.c4
-rw-r--r--drivers/net/eepro100.c1
-rw-r--r--drivers/net/eexpress.c2
-rw-r--r--drivers/net/ehea/ehea_main.c2
-rw-r--r--drivers/net/epic100.c1
-rw-r--r--drivers/net/eql.c2
-rw-r--r--drivers/net/es3210.c2
-rw-r--r--drivers/net/eth16i.c2
-rw-r--r--drivers/net/ewrk3.c1
-rw-r--r--drivers/net/fealnx.c1
-rw-r--r--drivers/net/fec_8xx/fec_main.c1
-rw-r--r--drivers/net/forcedeth.c1
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c1
-rw-r--r--drivers/net/gianfar.c1
-rw-r--r--drivers/net/hamachi.c1
-rw-r--r--drivers/net/hamradio/6pack.c2
-rw-r--r--drivers/net/hp-plus.c2
-rw-r--r--drivers/net/hp.c2
-rw-r--r--drivers/net/hp100.c5
-rw-r--r--drivers/net/hydra.c1
-rw-r--r--drivers/net/ibm_emac/ibm_emac_core.c1
-rw-r--r--drivers/net/ibmlana.c2
-rw-r--r--drivers/net/ibmveth.c4
-rw-r--r--drivers/net/ifb.c1
-rw-r--r--drivers/net/ioc3-eth.c1
-rw-r--r--drivers/net/irda/ali-ircc.c4
-rw-r--r--drivers/net/irda/donauboe.c1
-rw-r--r--drivers/net/irda/irda-usb.c1
-rw-r--r--drivers/net/irda/irport.c2
-rw-r--r--drivers/net/irda/kingsun-sir.c1
-rw-r--r--drivers/net/irda/ks959-sir.c1
-rw-r--r--drivers/net/irda/ksdazzle-sir.c1
-rw-r--r--drivers/net/irda/mcs7780.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c1
-rw-r--r--drivers/net/irda/sir_dev.c2
-rw-r--r--drivers/net/irda/smsc-ircc2.c2
-rw-r--r--drivers/net/irda/stir4200.c1
-rw-r--r--drivers/net/irda/via-ircc.c3
-rw-r--r--drivers/net/irda/vlsi_ir.c2
-rw-r--r--drivers/net/irda/w83977af_ir.c3
-rw-r--r--drivers/net/isa-skeleton.c2
-rw-r--r--drivers/net/ixgb/ixgb_main.c1
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c1
-rw-r--r--drivers/net/ixp2000/enp2611.c1
-rw-r--r--drivers/net/jazzsonic.c1
-rw-r--r--drivers/net/lance.c1
-rw-r--r--drivers/net/lguest_net.c2
-rw-r--r--drivers/net/lne390.c2
-rw-r--r--drivers/net/mac8390.c2
-rw-r--r--drivers/net/mac89x0.c2
-rw-r--r--drivers/net/macb.c1
-rw-r--r--drivers/net/mace.c1
-rw-r--r--drivers/net/macmace.c1
-rw-r--r--drivers/net/macsonic.c1
-rw-r--r--drivers/net/mv643xx_eth.c1
-rw-r--r--drivers/net/mvme147.c2
-rw-r--r--drivers/net/myri_sbus.c1
-rw-r--r--drivers/net/natsemi.c1
-rw-r--r--drivers/net/ne-h8300.c2
-rw-r--r--drivers/net/ne.c2
-rw-r--r--drivers/net/ne2.c2
-rw-r--r--drivers/net/ne2k-pci.c1
-rw-r--r--drivers/net/ne3210.c1
-rw-r--r--drivers/net/netx-eth.c1
-rw-r--r--drivers/net/netxen/netxen_nic_main.c1
-rw-r--r--drivers/net/ni5010.c2
-rw-r--r--drivers/net/ni52.c2
-rw-r--r--drivers/net/ni65.c1
-rw-r--r--drivers/net/ns83820.c1
-rw-r--r--drivers/net/pasemi_mac.c1
-rw-r--r--drivers/net/pci-skeleton.c1
-rw-r--r--drivers/net/pcmcia/3c589_cs.c1
-rw-r--r--drivers/net/pcmcia/axnet_cs.c3
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c1
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c1
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c1
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c1
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c1
-rw-r--r--drivers/net/pcnet32.c1
-rw-r--r--drivers/net/plip.c1
-rw-r--r--drivers/net/ps3_gelic_net.c1
-rwxr-xr-xdrivers/net/qla3xxx.c1
-rw-r--r--drivers/net/r8169.c1
-rw-r--r--drivers/net/rionet.c2
-rw-r--r--drivers/net/rrunner.c1
-rw-r--r--drivers/net/s2io.c1
-rw-r--r--drivers/net/sb1000.c1
-rw-r--r--drivers/net/shaper.c2
-rw-r--r--drivers/net/sis190.c1
-rw-r--r--drivers/net/sis900.c1
-rw-r--r--drivers/net/sk98lin/skge.c1
-rw-r--r--drivers/net/skfp/skfddi.c1
-rw-r--r--drivers/net/skge.c1
-rw-r--r--drivers/net/sky2.c1
-rw-r--r--drivers/net/slip.c2
-rw-r--r--drivers/net/smc-mca.c1
-rw-r--r--drivers/net/smc-ultra.c2
-rw-r--r--drivers/net/smc-ultra32.c2
-rw-r--r--drivers/net/smc911x.c1
-rw-r--r--drivers/net/smc9194.c2
-rw-r--r--drivers/net/smc91x.c1
-rw-r--r--drivers/net/spider_net.c1
-rw-r--r--drivers/net/starfire.c1
-rw-r--r--drivers/net/stnic.c1
-rw-r--r--drivers/net/sun3_82586.c1
-rw-r--r--drivers/net/sun3lance.c1
-rw-r--r--drivers/net/sunbmac.c1
-rw-r--r--drivers/net/sundance.c1
-rw-r--r--drivers/net/sungem.c1
-rw-r--r--drivers/net/sunhme.c2
-rw-r--r--drivers/net/sunlance.c1
-rw-r--r--drivers/net/sunqe.c1
-rw-r--r--drivers/net/tc35815.c1
-rw-r--r--drivers/net/tg3.c1
-rw-r--r--drivers/net/tlan.c1
-rw-r--r--drivers/net/tokenring/3c359.c1
-rw-r--r--drivers/net/tokenring/abyss.c2
-rw-r--r--drivers/net/tokenring/lanstreamer.c1
-rw-r--r--drivers/net/tokenring/madgemc.c1
-rw-r--r--drivers/net/tokenring/olympic.c1
-rw-r--r--drivers/net/tokenring/proteon.c1
-rw-r--r--drivers/net/tokenring/skisa.c1
-rw-r--r--drivers/net/tokenring/smctr.c2
-rw-r--r--drivers/net/tokenring/tmspci.c1
-rw-r--r--drivers/net/tsi108_eth.c1
-rw-r--r--drivers/net/tulip/de2104x.c1
-rw-r--r--drivers/net/tulip/de4x5.c1
-rw-r--r--drivers/net/tulip/dmfe.c1
-rw-r--r--drivers/net/tulip/tulip_core.c1
-rw-r--r--drivers/net/tulip/uli526x.c1
-rw-r--r--drivers/net/tulip/winbond-840.c1
-rw-r--r--drivers/net/tulip/xircom_cb.c1
-rw-r--r--drivers/net/tulip/xircom_tulip_cb.c1
-rw-r--r--drivers/net/tun.c1
-rw-r--r--drivers/net/typhoon.c1
-rw-r--r--drivers/net/ucc_geth.c1
-rw-r--r--drivers/net/usb/kaweth.c2
-rw-r--r--drivers/net/usb/pegasus.c1
-rw-r--r--drivers/net/usb/rtl8150.c1
-rw-r--r--drivers/net/usb/usbnet.c1
-rw-r--r--drivers/net/via-rhine.c1
-rw-r--r--drivers/net/via-velocity.c1
-rw-r--r--drivers/net/wan/c101.c1
-rw-r--r--drivers/net/wan/cycx_x25.c1
-rw-r--r--drivers/net/wan/dscc4.c1
-rw-r--r--drivers/net/wan/hostess_sv11.c2
-rw-r--r--drivers/net/wan/lapbether.c1
-rw-r--r--drivers/net/wan/lmc/lmc_main.c1
-rw-r--r--drivers/net/wan/n2.c1
-rw-r--r--drivers/net/wan/pc300too.c1
-rw-r--r--drivers/net/wan/pci200syn.c1
-rw-r--r--drivers/net/wan/sbni.c2
-rw-r--r--drivers/net/wan/sdla.c1
-rw-r--r--drivers/net/wan/wanxl.c1
-rw-r--r--drivers/net/wd.c2
-rw-r--r--drivers/net/wireless/airo.c1
-rw-r--r--drivers/net/wireless/airport.c1
-rw-r--r--drivers/net/wireless/arlan-main.c2
-rw-r--r--drivers/net/wireless/atmel.c1
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c1
-rw-r--r--drivers/net/wireless/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2200.c1
-rw-r--r--drivers/net/wireless/libertas/main.c4
-rw-r--r--drivers/net/wireless/netwave_cs.c1
-rw-r--r--drivers/net/wireless/orinoco_cs.c1
-rw-r--r--drivers/net/wireless/orinoco_nortel.c1
-rw-r--r--drivers/net/wireless/orinoco_pci.c1
-rw-r--r--drivers/net/wireless/orinoco_plx.c1
-rw-r--r--drivers/net/wireless/orinoco_tmd.c1
-rw-r--r--drivers/net/wireless/prism54/islpci_dev.c1
-rw-r--r--drivers/net/wireless/ray_cs.c1
-rw-r--r--drivers/net/wireless/spectrum_cs.c1
-rw-r--r--drivers/net/wireless/strip.c2
-rw-r--r--drivers/net/wireless/wavelan.c1
-rw-r--r--drivers/net/wireless/wavelan_cs.c1
-rw-r--r--drivers/net/wireless/wl3501_cs.c2
-rw-r--r--drivers/net/wireless/zd1211rw/zd_netdev.c1
-rw-r--r--drivers/net/xen-netfront.c1
-rw-r--r--drivers/net/yellowfin.c1
-rw-r--r--drivers/net/znet.c2
-rw-r--r--drivers/net/zorro8390.c1
231 files changed, 0 insertions, 316 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 4bee99ba7dbb..98e0bc4628a2 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -174,8 +174,6 @@ struct net_device * __init el1_probe(int unit)
174 mem_start = dev->mem_start & 7; 174 mem_start = dev->mem_start & 7;
175 } 175 }
176 176
177 SET_MODULE_OWNER(dev);
178
179 if (io > 0x1ff) { /* Check a single specified location. */ 177 if (io > 0x1ff) { /* Check a single specified location. */
180 err = el1_probe1(dev, io); 178 err = el1_probe1(dev, io);
181 } else if (io != 0) { 179 } else if (io != 0) {
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index bc7e906571d3..f9e7ffbcb772 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -95,8 +95,6 @@ static int __init do_el2_probe(struct net_device *dev)
95 int base_addr = dev->base_addr; 95 int base_addr = dev->base_addr;
96 int irq = dev->irq; 96 int irq = dev->irq;
97 97
98 SET_MODULE_OWNER(dev);
99
100 if (base_addr > 0x1ff) /* Check a single specified location. */ 98 if (base_addr > 0x1ff) /* Check a single specified location. */
101 return el2_probe1(dev, base_addr); 99 return el2_probe1(dev, base_addr);
102 else if (base_addr != 0) /* Don't probe at all. */ 100 else if (base_addr != 0) /* Don't probe at all. */
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index acede307c05d..c05bb3fc57a2 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1387,8 +1387,6 @@ static int __init elplus_setup(struct net_device *dev)
1387 unsigned long cookie = 0; 1387 unsigned long cookie = 0;
1388 int err = -ENODEV; 1388 int err = -ENODEV;
1389 1389
1390 SET_MODULE_OWNER(dev);
1391
1392 /* 1390 /*
1393 * setup adapter structure 1391 * setup adapter structure
1394 */ 1392 */
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index eed4299dc426..fac6edff2b8b 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -327,8 +327,6 @@ struct net_device * __init el16_probe(int unit)
327 mem_start = dev->mem_start & 15; 327 mem_start = dev->mem_start & 15;
328 } 328 }
329 329
330 SET_MODULE_OWNER(dev);
331
332 if (io > 0x1ff) /* Check a single specified location. */ 330 if (io > 0x1ff) /* Check a single specified location. */
333 err = el16_probe1(dev, io); 331 err = el16_probe1(dev, io);
334 else if (io != 0) 332 else if (io != 0)
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 127f60841b10..7466987d8451 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -432,7 +432,6 @@ __again:
432 return -ENOMEM; 432 return -ENOMEM;
433 } 433 }
434 434
435 SET_MODULE_OWNER(dev);
436 SET_NETDEV_DEV(dev, &idev->dev); 435 SET_NETDEV_DEV(dev, &idev->dev);
437 pnp_cards++; 436 pnp_cards++;
438 437
@@ -524,8 +523,6 @@ no_pnp:
524 if (!dev) 523 if (!dev)
525 return -ENOMEM; 524 return -ENOMEM;
526 525
527 SET_MODULE_OWNER(dev);
528
529 netdev_boot_setup_check(dev); 526 netdev_boot_setup_check(dev);
530 527
531 /* Set passed-in IRQ or I/O Addr. */ 528 /* Set passed-in IRQ or I/O Addr. */
@@ -644,7 +641,6 @@ static int __init el3_mca_probe(struct device *device)
644 return -ENOMEM; 641 return -ENOMEM;
645 } 642 }
646 643
647 SET_MODULE_OWNER(dev);
648 netdev_boot_setup_check(dev); 644 netdev_boot_setup_check(dev);
649 645
650 memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr)); 646 memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
@@ -704,8 +700,6 @@ static int __init el3_eisa_probe (struct device *device)
704 return -ENOMEM; 700 return -ENOMEM;
705 } 701 }
706 702
707 SET_MODULE_OWNER(dev);
708
709 netdev_boot_setup_check(dev); 703 netdev_boot_setup_check(dev);
710 704
711 memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr)); 705 memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 290166d5e7d1..38a2ebea9b45 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -501,8 +501,6 @@ static struct net_device *corkscrew_scan(int unit)
501 netdev_boot_setup_check(dev); 501 netdev_boot_setup_check(dev);
502 } 502 }
503 503
504 SET_MODULE_OWNER(dev);
505
506#ifdef __ISAPNP__ 504#ifdef __ISAPNP__
507 if(nopnp == 1) 505 if(nopnp == 1)
508 goto no_pnp; 506 goto no_pnp;
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index ab18343e58ef..10852b2a40ab 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -423,7 +423,6 @@ static int __init do_elmc_probe(struct net_device *dev)
423 int retval; 423 int retval;
424 struct priv *pr = dev->priv; 424 struct priv *pr = dev->priv;
425 425
426 SET_MODULE_OWNER(dev);
427 if (MCA_bus == 0) { 426 if (MCA_bus == 0) {
428 return -ENODEV; 427 return -ENODEV;
429 } 428 }
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index c7b571be20e0..5b5f44cdfc1d 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -257,8 +257,6 @@ struct net_device *__init mc32_probe(int unit)
257 if (unit >= 0) 257 if (unit >= 0)
258 sprintf(dev->name, "eth%d", unit); 258 sprintf(dev->name, "eth%d", unit);
259 259
260 SET_MODULE_OWNER(dev);
261
262 /* Do not check any supplied i/o locations. 260 /* Do not check any supplied i/o locations.
263 POS registers usually don't fail :) */ 261 POS registers usually don't fail :) */
264 262
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 29e558913eb5..ad0f6a729d29 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1036,7 +1036,6 @@ static int __devinit vortex_probe1(struct device *gendev,
1036 printk (KERN_ERR PFX "unable to allocate etherdev, aborting\n"); 1036 printk (KERN_ERR PFX "unable to allocate etherdev, aborting\n");
1037 goto out; 1037 goto out;
1038 } 1038 }
1039 SET_MODULE_OWNER(dev);
1040 SET_NETDEV_DEV(dev, gendev); 1039 SET_NETDEV_DEV(dev, gendev);
1041 vp = netdev_priv(dev); 1040 vp = netdev_priv(dev);
1042 1041
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 2dec3d6ae01a..30310ed9f75f 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1845,7 +1845,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1845 dev = alloc_etherdev(sizeof(struct cp_private)); 1845 dev = alloc_etherdev(sizeof(struct cp_private));
1846 if (!dev) 1846 if (!dev)
1847 return -ENOMEM; 1847 return -ENOMEM;
1848 SET_MODULE_OWNER(dev);
1849 SET_NETDEV_DEV(dev, &pdev->dev); 1848 SET_NETDEV_DEV(dev, &pdev->dev);
1850 1849
1851 cp = netdev_priv(dev); 1850 cp = netdev_priv(dev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 7ba470ee2175..28c1aaf1fe1d 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -766,7 +766,6 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
766 dev_err(&pdev->dev, "Unable to alloc new net device\n"); 766 dev_err(&pdev->dev, "Unable to alloc new net device\n");
767 return -ENOMEM; 767 return -ENOMEM;
768 } 768 }
769 SET_MODULE_OWNER(dev);
770 SET_NETDEV_DEV(dev, &pdev->dev); 769 SET_NETDEV_DEV(dev, &pdev->dev);
771 770
772 tp = netdev_priv(dev); 771 tp = netdev_priv(dev);
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index d915837193cc..43dffdca708f 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1234,7 +1234,6 @@ struct net_device * __init i82596_probe(int unit)
1234 DEB(DEB_PROBE,printk(KERN_INFO "%s", version)); 1234 DEB(DEB_PROBE,printk(KERN_INFO "%s", version));
1235 1235
1236 /* The 82596-specific entries in the device structure. */ 1236 /* The 82596-specific entries in the device structure. */
1237 SET_MODULE_OWNER(dev);
1238 dev->open = i596_open; 1237 dev->open = i596_open;
1239 dev->stop = i596_close; 1238 dev->stop = i596_close;
1240 dev->hard_start_xmit = i596_start_xmit; 1239 dev->hard_start_xmit = i596_start_xmit;
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index a45de6975bfe..fa0c6cb3d798 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -746,7 +746,6 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
746 return -ENOMEM; 746 return -ENOMEM;
747 } 747 }
748 748
749 SET_MODULE_OWNER(dev);
750 priv = netdev_priv(dev); 749 priv = netdev_priv(dev);
751 750
752 r1->name = dev->name; 751 r1->name = dev->name;
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 644c408515df..65b2de56ed22 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -103,8 +103,6 @@ static int __init do_ac3200_probe(struct net_device *dev)
103 int irq = dev->irq; 103 int irq = dev->irq;
104 int mem_start = dev->mem_start; 104 int mem_start = dev->mem_start;
105 105
106 SET_MODULE_OWNER(dev);
107
108 if (ioaddr > 0x1ff) /* Check a single specified location. */ 106 if (ioaddr > 0x1ff) /* Check a single specified location. */
109 return ac_probe1(ioaddr, dev); 107 return ac_probe1(ioaddr, dev);
110 else if (ioaddr > 0) /* Don't probe at all. */ 108 else if (ioaddr > 0) /* Don't probe at all. */
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 62e660a79387..ca00f41e4d85 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -465,7 +465,6 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
465 return -ENOMEM; 465 return -ENOMEM;
466 } 466 }
467 467
468 SET_MODULE_OWNER(dev);
469 SET_NETDEV_DEV(dev, &pdev->dev); 468 SET_NETDEV_DEV(dev, &pdev->dev);
470 469
471 ap = dev->priv; 470 ap = dev->priv;
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index cf06fc067e92..afb60a5927ae 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1982,7 +1982,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
1982 goto err_free_reg; 1982 goto err_free_reg;
1983 } 1983 }
1984 1984
1985 SET_MODULE_OWNER(dev);
1986 SET_NETDEV_DEV(dev, &pdev->dev); 1985 SET_NETDEV_DEV(dev, &pdev->dev);
1987 1986
1988#if AMD8111E_VLAN_TAG_USED 1987#if AMD8111E_VLAN_TAG_USED
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 954191119d35..b073810f9fd8 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -148,7 +148,6 @@ struct net_device * __init apne_probe(int unit)
148 sprintf(dev->name, "eth%d", unit); 148 sprintf(dev->name, "eth%d", unit);
149 netdev_boot_setup_check(dev); 149 netdev_boot_setup_check(dev);
150 } 150 }
151 SET_MODULE_OWNER(dev);
152 151
153 /* disable pcmcia irq for readtuple */ 152 /* disable pcmcia irq for readtuple */
154 pcmcia_disable_irq(); 153 pcmcia_disable_irq();
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index da6ffa8cd81e..c4b560d42a67 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -235,8 +235,6 @@ struct net_device * __init cops_probe(int unit)
235 base_addr = dev->base_addr = io; 235 base_addr = dev->base_addr = io;
236 } 236 }
237 237
238 SET_MODULE_OWNER(dev);
239
240 if (base_addr > 0x1ff) { /* Check a single specified location. */ 238 if (base_addr > 0x1ff) { /* Check a single specified location. */
241 err = cops_probe1(dev, base_addr); 239 err = cops_probe1(dev, base_addr);
242 } else if (base_addr != 0) { /* Don't probe at all. */ 240 } else if (base_addr != 0) { /* Don't probe at all. */
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index f22e46dfd770..56cb96794026 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -65,7 +65,6 @@ static struct net_device * __init ipddp_init(void)
65 if (!dev) 65 if (!dev)
66 return ERR_PTR(-ENOMEM); 66 return ERR_PTR(-ENOMEM);
67 67
68 SET_MODULE_OWNER(dev);
69 strcpy(dev->name, "ipddp%d"); 68 strcpy(dev->name, "ipddp%d");
70 69
71 if (version_printed++ == 0) 70 if (version_printed++ == 0)
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6a6cbd331a16..cb4744e56905 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1046,8 +1046,6 @@ struct net_device * __init ltpc_probe(void)
1046 if (!dev) 1046 if (!dev)
1047 goto out; 1047 goto out;
1048 1048
1049 SET_MODULE_OWNER(dev);
1050
1051 /* probe for the I/O port address */ 1049 /* probe for the I/O port address */
1052 1050
1053 if (io != 0x240 && request_region(0x220,8,"ltpc")) { 1051 if (io != 0x240 && request_region(0x220,8,"ltpc")) {
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 1f0302735416..6599f1046c7b 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -398,8 +398,6 @@ static int __init com90io_init(void)
398 if (!dev) 398 if (!dev)
399 return -ENOMEM; 399 return -ENOMEM;
400 400
401 SET_MODULE_OWNER(dev);
402
403 dev->base_addr = io; 401 dev->base_addr = io;
404 dev->irq = irq; 402 dev->irq = irq;
405 if (dev->irq == 2) 403 if (dev->irq == 2)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index bc5a38a6705f..2c020a36177e 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -183,7 +183,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
183 return -ENOMEM; 183 return -ENOMEM;
184 } 184 }
185 185
186 SET_MODULE_OWNER(dev);
187 priv = netdev_priv(dev); 186 priv = netdev_priv(dev);
188 187
189 r1->name = dev->name; 188 r1->name = dev->name;
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index ef2cc80256a3..619810a01e5b 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -986,7 +986,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
986 986
987 dev->base_addr = AT91_VA_BASE_EMAC; 987 dev->base_addr = AT91_VA_BASE_EMAC;
988 dev->irq = AT91RM9200_ID_EMAC; 988 dev->irq = AT91RM9200_ID_EMAC;
989 SET_MODULE_OWNER(dev);
990 989
991 /* Install the interrupt handler */ 990 /* Install the interrupt handler */
992 if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) { 991 if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) {
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 80f33b6d5713..6ec8a587c1d2 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -1009,7 +1009,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
1009 goto release; 1009 goto release;
1010 } 1010 }
1011 1011
1012 SET_MODULE_OWNER(dev);
1013 SET_NETDEV_DEV(dev, &ec->dev); 1012 SET_NETDEV_DEV(dev, &ec->dev);
1014 1013
1015 dev->irq = ec->irq; 1014 dev->irq = ec->irq;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 3805506a3ab8..4a914748c0e4 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -789,7 +789,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
789 goto release; 789 goto release;
790 } 790 }
791 791
792 SET_MODULE_OWNER(dev);
793 SET_NETDEV_DEV(dev, &ec->dev); 792 SET_NETDEV_DEV(dev, &ec->dev);
794 793
795 priv(dev)->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); 794 priv(dev)->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 0d37d9d1fd78..5d093b3ddcd4 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -661,7 +661,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
661 goto release; 661 goto release;
662 } 662 }
663 663
664 SET_MODULE_OWNER(dev);
665 SET_NETDEV_DEV(dev, &ec->dev); 664 SET_NETDEV_DEV(dev, &ec->dev);
666 665
667 dev->open = etherh_open; 666 dev->open = etherh_open;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index bed8e0ebaf19..d20148e69fa1 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -225,8 +225,6 @@ struct net_device * __init at1700_probe(int unit)
225 dev->irq = irq; 225 dev->irq = irq;
226 } 226 }
227 227
228 SET_MODULE_OWNER(dev);
229
230 if (io > 0x1ff) { /* Check a single specified location. */ 228 if (io > 0x1ff) { /* Check a single specified location. */
231 err = at1700_probe1(dev, io); 229 err = at1700_probe1(dev, io);
232 } else if (io != 0) { /* Don't probe at all. */ 230 } else if (io != 0) { /* Don't probe at all. */
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index dfa8b9ba4c80..97cca505cf90 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -390,7 +390,6 @@ struct net_device * __init atarilance_probe(int unit)
390 sprintf(dev->name, "eth%d", unit); 390 sprintf(dev->name, "eth%d", unit);
391 netdev_boot_setup_check(dev); 391 netdev_boot_setup_check(dev);
392 } 392 }
393 SET_MODULE_OWNER(dev);
394 393
395 for( i = 0; i < N_LANCE_ADDR; ++i ) { 394 for( i = 0; i < N_LANCE_ADDR; ++i ) {
396 if (lance_probe1( dev, &lance_addr_list[i] )) { 395 if (lance_probe1( dev, &lance_addr_list[i] )) {
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 469ff95be559..e1a9223d0c18 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -2234,7 +2234,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
2234 err = -ENOMEM; 2234 err = -ENOMEM;
2235 goto err_alloc_etherdev; 2235 goto err_alloc_etherdev;
2236 } 2236 }
2237 SET_MODULE_OWNER(netdev);
2238 SET_NETDEV_DEV(netdev, &pdev->dev); 2237 SET_NETDEV_DEV(netdev, &pdev->dev);
2239 2238
2240 pci_set_drvdata(pdev, netdev); 2239 pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 82d78ff8399b..6020d5ec38b9 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -299,7 +299,6 @@ static int __init atp_probe1(long ioaddr)
299 dev = alloc_etherdev(sizeof(struct net_local)); 299 dev = alloc_etherdev(sizeof(struct net_local));
300 if (!dev) 300 if (!dev)
301 return -ENOMEM; 301 return -ENOMEM;
302 SET_MODULE_OWNER(dev);
303 302
304 /* Find the IRQ used by triggering an interrupt. */ 303 /* Find the IRQ used by triggering an interrupt. */
305 write_reg_byte(ioaddr, CMR2, 0x01); /* No accept mode, IRQ out. */ 304 write_reg_byte(ioaddr, CMR2, 0x01); /* No accept mode, IRQ out. */
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index b92b3e25c42a..6d193705a3bc 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2151,7 +2151,6 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
2151 goto err_out_free_res; 2151 goto err_out_free_res;
2152 } 2152 }
2153 2153
2154 SET_MODULE_OWNER(dev);
2155 SET_NETDEV_DEV(dev,&pdev->dev); 2154 SET_NETDEV_DEV(dev,&pdev->dev);
2156 2155
2157 /* No interesting netdevice features in this card... */ 2156 /* No interesting netdevice features in this card... */
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 3354c534335d..e5bbcbe8de5f 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -941,7 +941,6 @@ static int bfin_mac_probe(struct platform_device *pdev)
941 return -ENOMEM; 941 return -ENOMEM;
942 } 942 }
943 943
944 SET_MODULE_OWNER(ndev);
945 SET_NETDEV_DEV(ndev, &pdev->dev); 944 SET_NETDEV_DEV(ndev, &pdev->dev);
946 945
947 platform_set_drvdata(pdev, ndev); 946 platform_set_drvdata(pdev, ndev);
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 1eb95b603004..ee157f5a5dbc 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1291,7 +1291,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
1291 } 1291 }
1292 1292
1293 bp = netdev_priv(dev); 1293 bp = netdev_priv(dev);
1294 SET_MODULE_OWNER(dev);
1295 SET_NETDEV_DEV(dev, &mdev->ofdev.dev); 1294 SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
1296 macio_set_drvdata(mdev, dev); 1295 macio_set_drvdata(mdev, dev);
1297 1296
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ab028ad04235..61debba873ac 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6474,7 +6474,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
6474 u32 reg; 6474 u32 reg;
6475 u64 dma_mask, persist_dma_mask; 6475 u64 dma_mask, persist_dma_mask;
6476 6476
6477 SET_MODULE_OWNER(dev);
6478 SET_NETDEV_DEV(dev, &pdev->dev); 6477 SET_NETDEV_DEV(dev, &pdev->dev);
6479 bp = netdev_priv(dev); 6478 bp = netdev_priv(dev);
6480 6479
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 559fe9437e0b..88ff72ac9b0a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4674,8 +4674,6 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
4674 goto out_netdev; 4674 goto out_netdev;
4675 } 4675 }
4676 4676
4677 SET_MODULE_OWNER(bond_dev);
4678
4679 res = register_netdevice(bond_dev); 4677 res = register_netdevice(bond_dev);
4680 if (res < 0) { 4678 if (res < 0) {
4681 goto out_bond; 4679 goto out_bond;
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 13f14df21e6e..f44f3d2a4b4e 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4900,7 +4900,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
4900 err = -ENOMEM; 4900 err = -ENOMEM;
4901 goto err_out_disable_pdev; 4901 goto err_out_disable_pdev;
4902 } 4902 }
4903 SET_MODULE_OWNER(dev);
4904 SET_NETDEV_DEV(dev, &pdev->dev); 4903 SET_NETDEV_DEV(dev, &pdev->dev);
4905 4904
4906 err = pci_request_regions(pdev, dev->name); 4905 err = pci_request_regions(pdev, dev->name);
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 593736c7550d..884aa0cd0006 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -1036,7 +1036,6 @@ static int __devinit init_one(struct pci_dev *pdev,
1036 goto out_free_dev; 1036 goto out_free_dev;
1037 } 1037 }
1038 1038
1039 SET_MODULE_OWNER(netdev);
1040 SET_NETDEV_DEV(netdev, &pdev->dev); 1039 SET_NETDEV_DEV(netdev, &pdev->dev);
1041 1040
1042 if (!adapter) { 1041 if (!adapter) {
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 9774bb1b3e80..2b4c92193912 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -517,7 +517,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
517 int eeprom_buff[CHKSUM_LEN]; 517 int eeprom_buff[CHKSUM_LEN];
518 int retval; 518 int retval;
519 519
520 SET_MODULE_OWNER(dev);
521 /* Initialize the device structure. */ 520 /* Initialize the device structure. */
522 if (!modular) { 521 if (!modular) {
523 memset(lp, 0, sizeof(*lp)); 522 memset(lp, 0, sizeof(*lp));
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index a6723ae79bdd..19937498589d 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2465,7 +2465,6 @@ static int __devinit init_one(struct pci_dev *pdev,
2465 goto out_free_dev; 2465 goto out_free_dev;
2466 } 2466 }
2467 2467
2468 SET_MODULE_OWNER(netdev);
2469 SET_NETDEV_DEV(netdev, &pdev->dev); 2468 SET_NETDEV_DEV(netdev, &pdev->dev);
2470 2469
2471 adapter->port[i] = netdev; 2470 adapter->port[i] = netdev;
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index dae97b860daa..5dd0d9c0eac9 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -394,7 +394,6 @@ static struct net_device * __init de600_probe(void)
394 if (!dev) 394 if (!dev)
395 return ERR_PTR(-ENOMEM); 395 return ERR_PTR(-ENOMEM);
396 396
397 SET_MODULE_OWNER(dev);
398 397
399 if (!request_region(DE600_IO, 3, "de600")) { 398 if (!request_region(DE600_IO, 3, "de600")) {
400 printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO); 399 printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO);
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index dc4892426174..a92c207b8839 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -823,8 +823,6 @@ struct net_device * __init de620_probe(int unit)
823 if (!dev) 823 if (!dev)
824 goto out; 824 goto out;
825 825
826 SET_MODULE_OWNER(dev);
827
828 spin_lock_init(&de620_lock); 826 spin_lock_init(&de620_lock);
829 827
830 /* 828 /*
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 9c8e3f9f5e58..b07613e61f53 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -539,7 +539,6 @@ static int __devinit dfx_register(struct device *bdev)
539 goto err_out; 539 goto err_out;
540 } 540 }
541 541
542 SET_MODULE_OWNER(dev);
543 SET_NETDEV_DEV(dev, bdev); 542 SET_NETDEV_DEV(dev, bdev);
544 543
545 bp = netdev_priv(dev); 544 bp = netdev_priv(dev);
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index df62c0232f36..ddedb76303d5 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1272,7 +1272,6 @@ dgrs_found_device(
1272 priv->chan = 1; 1272 priv->chan = 1;
1273 priv->devtbl[0] = dev; 1273 priv->devtbl[0] = dev;
1274 1274
1275 SET_MODULE_OWNER(dev);
1276 SET_NETDEV_DEV(dev, pdev); 1275 SET_NETDEV_DEV(dev, pdev);
1277 1276
1278 ret = dgrs_probe1(dev); 1277 ret = dgrs_probe1(dev);
@@ -1320,7 +1319,6 @@ dgrs_found_device(
1320 if (ret) 1319 if (ret)
1321 goto fail; 1320 goto fail;
1322 1321
1323 SET_MODULE_OWNER(devN);
1324 SET_NETDEV_DEV(dev, pdev); 1322 SET_NETDEV_DEV(dev, pdev);
1325 1323
1326 ret = register_netdev(devN); 1324 ret = register_netdev(devN);
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index ca21a1888ffa..12486e13b85b 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -116,7 +116,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
116 err = -ENOMEM; 116 err = -ENOMEM;
117 goto err_out_res; 117 goto err_out_res;
118 } 118 }
119 SET_MODULE_OWNER (dev);
120 SET_NETDEV_DEV(dev, &pdev->dev); 119 SET_NETDEV_DEV(dev, &pdev->dev);
121 120
122#ifdef MEM_MAPPING 121#ifdef MEM_MAPPING
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 738aa5906514..857eb366bb11 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -416,7 +416,6 @@ dm9000_probe(struct platform_device *pdev)
416 return -ENOMEM; 416 return -ENOMEM;
417 } 417 }
418 418
419 SET_MODULE_OWNER(ndev);
420 SET_NETDEV_DEV(ndev, &pdev->dev); 419 SET_NETDEV_DEV(ndev, &pdev->dev);
421 420
422 PRINTK2("dm9000_probe()"); 421 PRINTK2("dm9000_probe()");
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 756a6bcb038d..84e14f397d9a 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -71,7 +71,6 @@ static void dummy_setup(struct net_device *dev)
71 dev->change_mtu = NULL; 71 dev->change_mtu = NULL;
72 dev->flags |= IFF_NOARP; 72 dev->flags |= IFF_NOARP;
73 dev->flags &= ~IFF_MULTICAST; 73 dev->flags &= ~IFF_MULTICAST;
74 SET_MODULE_OWNER(dev);
75 random_ether_addr(dev->dev_addr); 74 random_ether_addr(dev->dev_addr);
76} 75}
77 76
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 10907f158bac..f9aa13e04ada 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2604,7 +2604,6 @@ static int __devinit e100_probe(struct pci_dev *pdev,
2604 goto err_out_free_res; 2604 goto err_out_free_res;
2605 } 2605 }
2606 2606
2607 SET_MODULE_OWNER(netdev);
2608 SET_NETDEV_DEV(netdev, &pdev->dev); 2607 SET_NETDEV_DEV(netdev, &pdev->dev);
2609 2608
2610 if (use_io) 2609 if (use_io)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 723568d6e44a..7befb706ad55 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -897,7 +897,6 @@ e1000_probe(struct pci_dev *pdev,
897 if (!netdev) 897 if (!netdev)
898 goto err_alloc_etherdev; 898 goto err_alloc_etherdev;
899 899
900 SET_MODULE_OWNER(netdev);
901 SET_NETDEV_DEV(netdev, &pdev->dev); 900 SET_NETDEV_DEV(netdev, &pdev->dev);
902 901
903 pci_set_drvdata(pdev, netdev); 902 pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index eeb40ccbcb22..885d9467f40d 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4040,7 +4040,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4040 if (!netdev) 4040 if (!netdev)
4041 goto err_alloc_etherdev; 4041 goto err_alloc_etherdev;
4042 4042
4043 SET_MODULE_OWNER(netdev);
4044 SET_NETDEV_DEV(netdev, &pdev->dev); 4043 SET_NETDEV_DEV(netdev, &pdev->dev);
4045 4044
4046 pci_set_drvdata(pdev, netdev); 4045 pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index b2b0a96218ca..6390f51ea6fb 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -124,8 +124,6 @@ static int __init do_e2100_probe(struct net_device *dev)
124 int base_addr = dev->base_addr; 124 int base_addr = dev->base_addr;
125 int irq = dev->irq; 125 int irq = dev->irq;
126 126
127 SET_MODULE_OWNER(dev);
128
129 if (base_addr > 0x1ff) /* Check a single specified location. */ 127 if (base_addr > 0x1ff) /* Check a single specified location. */
130 return e21_probe1(dev, base_addr); 128 return e21_probe1(dev, base_addr);
131 else if (base_addr != 0) /* Don't probe at all. */ 129 else if (base_addr != 0) /* Don't probe at all. */
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 47680237f783..6eb84f14c88d 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -537,8 +537,6 @@ static int __init do_eepro_probe(struct net_device *dev)
537 int base_addr = dev->base_addr; 537 int base_addr = dev->base_addr;
538 int irq = dev->irq; 538 int irq = dev->irq;
539 539
540 SET_MODULE_OWNER(dev);
541
542#ifdef PnPWakeup 540#ifdef PnPWakeup
543 /* XXXX for multiple cards should this only be run once? */ 541 /* XXXX for multiple cards should this only be run once? */
544 542
@@ -594,8 +592,6 @@ struct net_device * __init eepro_probe(int unit)
594 if (!dev) 592 if (!dev)
595 return ERR_PTR(-ENODEV); 593 return ERR_PTR(-ENODEV);
596 594
597 SET_MODULE_OWNER(dev);
598
599 sprintf(dev->name, "eth%d", unit); 595 sprintf(dev->name, "eth%d", unit);
600 netdev_boot_setup_check(dev); 596 netdev_boot_setup_check(dev);
601 597
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 3c54014acece..f8b69ceb2be6 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -635,7 +635,6 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
635 return -1; 635 return -1;
636 } 636 }
637 637
638 SET_MODULE_OWNER(dev);
639 SET_NETDEV_DEV(dev, &pdev->dev); 638 SET_NETDEV_DEV(dev, &pdev->dev);
640 639
641 if (dev->mem_start > 0) 640 if (dev->mem_start > 0)
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 7934ea37f944..6c91bfa72bb2 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -341,8 +341,6 @@ static int __init do_express_probe(struct net_device *dev)
341 int dev_irq = dev->irq; 341 int dev_irq = dev->irq;
342 int err; 342 int err;
343 343
344 SET_MODULE_OWNER(dev);
345
346 dev->if_port = 0xff; /* not set */ 344 dev->if_port = 0xff; /* not set */
347 345
348#ifdef CONFIG_MCA_LEGACY 346#ifdef CONFIG_MCA_LEGACY
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index b8e00391a5e3..62d6c1e5f9d3 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2710,8 +2710,6 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
2710 SET_NETDEV_DEV(dev, port_dev); 2710 SET_NETDEV_DEV(dev, port_dev);
2711 2711
2712 /* initialize net_device structure */ 2712 /* initialize net_device structure */
2713 SET_MODULE_OWNER(dev);
2714
2715 memcpy(dev->dev_addr, &port->mac_addr, ETH_ALEN); 2713 memcpy(dev->dev_addr, &port->mac_addr, ETH_ALEN);
2716 2714
2717 dev->open = ehea_open; 2715 dev->open = ehea_open;
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index f8446e373bdd..122ffd2f0822 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -352,7 +352,6 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
352 dev_err(&pdev->dev, "no memory for eth device\n"); 352 dev_err(&pdev->dev, "no memory for eth device\n");
353 goto err_out_free_res; 353 goto err_out_free_res;
354 } 354 }
355 SET_MODULE_OWNER(dev);
356 SET_NETDEV_DEV(dev, &pdev->dev); 355 SET_NETDEV_DEV(dev, &pdev->dev);
357 356
358#ifdef USE_IO_OPS 357#ifdef USE_IO_OPS
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index f1cc66dcbdfd..7266f6dbdd95 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -167,8 +167,6 @@ static void __init eql_setup(struct net_device *dev)
167{ 167{
168 equalizer_t *eql = netdev_priv(dev); 168 equalizer_t *eql = netdev_priv(dev);
169 169
170 SET_MODULE_OWNER(dev);
171
172 init_timer(&eql->timer); 170 init_timer(&eql->timer);
173 eql->timer.data = (unsigned long) eql; 171 eql->timer.data = (unsigned long) eql;
174 eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL; 172 eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL;
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 822e5bfd1a71..238fa8aff02d 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -130,8 +130,6 @@ static int __init do_es_probe(struct net_device *dev)
130 int irq = dev->irq; 130 int irq = dev->irq;
131 int mem_start = dev->mem_start; 131 int mem_start = dev->mem_start;
132 132
133 SET_MODULE_OWNER(dev);
134
135 if (ioaddr > 0x1ff) /* Check a single specified location. */ 133 if (ioaddr > 0x1ff) /* Check a single specified location. */
136 return es_probe1(dev, ioaddr); 134 return es_probe1(dev, ioaddr);
137 else if (ioaddr > 0) /* Don't probe at all. */ 135 else if (ioaddr > 0) /* Don't probe at all. */
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 04abf59e5007..0e3b33717cac 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -436,8 +436,6 @@ static int __init do_eth16i_probe(struct net_device *dev)
436 int ioaddr; 436 int ioaddr;
437 int base_addr = dev->base_addr; 437 int base_addr = dev->base_addr;
438 438
439 SET_MODULE_OWNER(dev);
440
441 if(eth16i_debug > 4) 439 if(eth16i_debug > 4)
442 printk(KERN_DEBUG "Probing started for %s\n", cardname); 440 printk(KERN_DEBUG "Probing started for %s\n", cardname);
443 441
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index cb0792c187ba..6a5d0436e89e 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -356,7 +356,6 @@ struct net_device * __init ewrk3_probe(int unit)
356 sprintf(dev->name, "eth%d", unit); 356 sprintf(dev->name, "eth%d", unit);
357 netdev_boot_setup_check(dev); 357 netdev_boot_setup_check(dev);
358 } 358 }
359 SET_MODULE_OWNER(dev);
360 359
361 err = ewrk3_probe1(dev, dev->base_addr, dev->irq); 360 err = ewrk3_probe1(dev, dev->base_addr, dev->irq);
362 if (err) 361 if (err)
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index ff9f177d7157..e9353072a96d 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -527,7 +527,6 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
527 err = -ENOMEM; 527 err = -ENOMEM;
528 goto err_out_unmap; 528 goto err_out_unmap;
529 } 529 }
530 SET_MODULE_OWNER(dev);
531 SET_NETDEV_DEV(dev, &pdev->dev); 530 SET_NETDEV_DEV(dev, &pdev->dev);
532 531
533 /* read ethernet id */ 532 /* read ethernet id */
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 6348fb93ca9c..6f214ab12fff 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -1103,7 +1103,6 @@ int fec_8xx_init_one(const struct fec_platform_info *fpi,
1103 err = -ENOMEM; 1103 err = -ENOMEM;
1104 goto err; 1104 goto err;
1105 } 1105 }
1106 SET_MODULE_OWNER(dev);
1107 1106
1108 fep = netdev_priv(dev); 1107 fep = netdev_priv(dev);
1109 fep->dev = dev; 1108 fep->dev = dev;
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 24c1294614f2..050a8f14eda8 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5004,7 +5004,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
5004 np->dev = dev; 5004 np->dev = dev;
5005 np->pci_dev = pci_dev; 5005 np->pci_dev = pci_dev;
5006 spin_lock_init(&np->lock); 5006 spin_lock_init(&np->lock);
5007 SET_MODULE_OWNER(dev);
5008 SET_NETDEV_DEV(dev, &pci_dev->dev); 5007 SET_NETDEV_DEV(dev, &pci_dev->dev);
5009 5008
5010 init_timer(&np->oom_kick); 5009 init_timer(&np->oom_kick);
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 2812b524edae..f6789a8db8cd 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -953,7 +953,6 @@ static struct net_device *fs_init_instance(struct device *dev,
953 err = -ENOMEM; 953 err = -ENOMEM;
954 goto err; 954 goto err;
955 } 955 }
956 SET_MODULE_OWNER(ndev);
957 956
958 fep = netdev_priv(ndev); 957 fep = netdev_priv(ndev);
959 958
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index bd2de325bbdd..002f8baaab2d 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -254,7 +254,6 @@ static int gfar_probe(struct platform_device *pdev)
254 /* Set the dev->base_addr to the gfar reg region */ 254 /* Set the dev->base_addr to the gfar reg region */
255 dev->base_addr = (unsigned long) (priv->regs); 255 dev->base_addr = (unsigned long) (priv->regs);
256 256
257 SET_MODULE_OWNER(dev);
258 SET_NETDEV_DEV(dev, &pdev->dev); 257 SET_NETDEV_DEV(dev, &pdev->dev);
259 258
260 /* Fill in the dev structure */ 259 /* Fill in the dev structure */
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 15254dc7876a..da12b3db023f 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -613,7 +613,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
613 if (!dev) 613 if (!dev)
614 goto err_out_iounmap; 614 goto err_out_iounmap;
615 615
616 SET_MODULE_OWNER(dev);
617 SET_NETDEV_DEV(dev, &pdev->dev); 616 SET_NETDEV_DEV(dev, &pdev->dev);
618 617
619#ifdef TX_CHECKSUM 618#ifdef TX_CHECKSUM
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 760d04a671f9..0a847326a5e4 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -345,8 +345,6 @@ static void sp_setup(struct net_device *dev)
345 memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN); 345 memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
346 memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN); 346 memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
347 347
348 SET_MODULE_OWNER(dev);
349
350 dev->flags = 0; 348 dev->flags = 0;
351} 349}
352 350
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 99a36cc3f8df..8d4f810fa288 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -122,8 +122,6 @@ static int __init do_hpp_probe(struct net_device *dev)
122 int base_addr = dev->base_addr; 122 int base_addr = dev->base_addr;
123 int irq = dev->irq; 123 int irq = dev->irq;
124 124
125 SET_MODULE_OWNER(dev);
126
127 if (base_addr > 0x1ff) /* Check a single specified location. */ 125 if (base_addr > 0x1ff) /* Check a single specified location. */
128 return hpp_probe1(dev, base_addr); 126 return hpp_probe1(dev, base_addr);
129 else if (base_addr != 0) /* Don't probe at all. */ 127 else if (base_addr != 0) /* Don't probe at all. */
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 635b13c2e2aa..1f11126de354 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -86,8 +86,6 @@ static int __init do_hp_probe(struct net_device *dev)
86 int base_addr = dev->base_addr; 86 int base_addr = dev->base_addr;
87 int irq = dev->irq; 87 int irq = dev->irq;
88 88
89 SET_MODULE_OWNER(dev);
90
91 if (base_addr > 0x1ff) /* Check a single specified location. */ 89 if (base_addr > 0x1ff) /* Check a single specified location. */
92 return hp_probe1(dev, base_addr); 90 return hp_probe1(dev, base_addr);
93 else if (base_addr != 0) /* Don't probe at all. */ 91 else if (base_addr != 0) /* Don't probe at all. */
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 8caa591c5649..406d6525e222 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -404,8 +404,6 @@ struct net_device * __init hp100_probe(int unit)
404 if (!dev) 404 if (!dev)
405 return ERR_PTR(-ENODEV); 405 return ERR_PTR(-ENODEV);
406 406
407 SET_MODULE_OWNER(dev);
408
409#ifdef HP100_DEBUG_B 407#ifdef HP100_DEBUG_B
410 hp100_outw(0x4200, TRACE); 408 hp100_outw(0x4200, TRACE);
411 printk("hp100: %s: probe\n", dev->name); 409 printk("hp100: %s: probe\n", dev->name);
@@ -2843,7 +2841,6 @@ static int __init hp100_eisa_probe (struct device *gendev)
2843 if (!dev) 2841 if (!dev)
2844 return -ENOMEM; 2842 return -ENOMEM;
2845 2843
2846 SET_MODULE_OWNER(dev);
2847 SET_NETDEV_DEV(dev, &edev->dev); 2844 SET_NETDEV_DEV(dev, &edev->dev);
2848 2845
2849 err = hp100_probe1(dev, edev->base_addr + 0xC38, HP100_BUS_EISA, NULL); 2846 err = hp100_probe1(dev, edev->base_addr + 0xC38, HP100_BUS_EISA, NULL);
@@ -2896,7 +2893,6 @@ static int __devinit hp100_pci_probe (struct pci_dev *pdev,
2896 goto out0; 2893 goto out0;
2897 } 2894 }
2898 2895
2899 SET_MODULE_OWNER(dev);
2900 SET_NETDEV_DEV(dev, &pdev->dev); 2896 SET_NETDEV_DEV(dev, &pdev->dev);
2901 2897
2902 pci_read_config_word(pdev, PCI_COMMAND, &pci_command); 2898 pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
@@ -2993,7 +2989,6 @@ static int __init hp100_isa_init(void)
2993 2989
2994 return -ENOMEM; 2990 return -ENOMEM;
2995 } 2991 }
2996 SET_MODULE_OWNER(dev);
2997 2992
2998 err = hp100_isa_probe(dev, hp100_port[i]); 2993 err = hp100_isa_probe(dev, hp100_port[i]);
2999 if (!err) 2994 if (!err)
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index f970bfbb9db2..31300a9dd965 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -112,7 +112,6 @@ static int __devinit hydra_init(struct zorro_dev *z)
112 dev = ____alloc_ei_netdev(0); 112 dev = ____alloc_ei_netdev(0);
113 if (!dev) 113 if (!dev)
114 return -ENOMEM; 114 return -ENOMEM;
115 SET_MODULE_OWNER(dev);
116 115
117 for(j = 0; j < ETHER_ADDR_LEN; j++) 116 for(j = 0; j < ETHER_ADDR_LEN; j++)
118 dev->dev_addr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j)); 117 dev->dev_addr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j));
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index f752e5fc65ba..354616b0b57b 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -1962,7 +1962,6 @@ static int __init emac_probe(struct ocp_device *ocpdev)
1962 dev->ndev = ndev; 1962 dev->ndev = ndev;
1963 dev->ldev = &ocpdev->dev; 1963 dev->ldev = &ocpdev->dev;
1964 dev->def = ocpdev->def; 1964 dev->def = ocpdev->def;
1965 SET_MODULE_OWNER(ndev);
1966 1965
1967 /* Find MAL device we are connected to */ 1966 /* Find MAL device we are connected to */
1968 maldev = 1967 maldev =
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index fe85d6fcba33..67d82fa7659d 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -907,8 +907,6 @@ static int ibmlana_probe(struct net_device *dev)
907 ibmlana_priv *priv; 907 ibmlana_priv *priv;
908 ibmlana_medium medium; 908 ibmlana_medium medium;
909 909
910 SET_MODULE_OWNER(dev);
911
912 /* can't work without an MCA bus ;-) */ 910 /* can't work without an MCA bus ;-) */
913 if (MCA_bus == 0) 911 if (MCA_bus == 0)
914 return -ENODEV; 912 return -ENODEV;
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 2dff9f2800cd..db908c40dbe1 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1142,8 +1142,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
1142 if(!netdev) 1142 if(!netdev)
1143 return -ENOMEM; 1143 return -ENOMEM;
1144 1144
1145 SET_MODULE_OWNER(netdev);
1146
1147 adapter = netdev->priv; 1145 adapter = netdev->priv;
1148 dev->dev.driver_data = netdev; 1146 dev->dev.driver_data = netdev;
1149 1147
@@ -1258,7 +1256,6 @@ static void ibmveth_proc_register_driver(void)
1258{ 1256{
1259 ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net); 1257 ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net);
1260 if (ibmveth_proc_dir) { 1258 if (ibmveth_proc_dir) {
1261 SET_MODULE_OWNER(ibmveth_proc_dir);
1262 } 1259 }
1263} 1260}
1264 1261
@@ -1356,7 +1353,6 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
1356 } else { 1353 } else {
1357 entry->data = (void *) adapter; 1354 entry->data = (void *) adapter;
1358 entry->proc_fops = &ibmveth_proc_fops; 1355 entry->proc_fops = &ibmveth_proc_fops;
1359 SET_MODULE_OWNER(entry);
1360 } 1356 }
1361 } 1357 }
1362 return; 1358 return;
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index b06c6db4383a..448e618b6974 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -152,7 +152,6 @@ static void ifb_setup(struct net_device *dev)
152 dev->change_mtu = NULL; 152 dev->change_mtu = NULL;
153 dev->flags |= IFF_NOARP; 153 dev->flags |= IFF_NOARP;
154 dev->flags &= ~IFF_MULTICAST; 154 dev->flags &= ~IFF_MULTICAST;
155 SET_MODULE_OWNER(dev);
156 random_ether_addr(dev->dev_addr); 155 random_ether_addr(dev->dev_addr);
157} 156}
158 157
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index c030030e5863..05d2bc15144e 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1273,7 +1273,6 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1273 if (err) 1273 if (err)
1274 goto out_free; 1274 goto out_free;
1275 1275
1276 SET_MODULE_OWNER(dev);
1277 SET_NETDEV_DEV(dev, &pdev->dev); 1276 SET_NETDEV_DEV(dev, &pdev->dev);
1278 1277
1279 ip = netdev_priv(dev); 1278 ip = netdev_priv(dev);
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index f9c889c0dd07..9f584521304a 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -360,10 +360,6 @@ static int ali_ircc_open(int i, chipio_t *info)
360 self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; 360 self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0;
361 self->tx_fifo.tail = self->tx_buff.head; 361 self->tx_fifo.tail = self->tx_buff.head;
362 362
363
364 /* Keep track of module usage */
365 SET_MODULE_OWNER(dev);
366
367 /* Override the network functions we need to use */ 363 /* Override the network functions we need to use */
368 dev->hard_start_xmit = ali_ircc_sir_hard_xmit; 364 dev->hard_start_xmit = ali_ircc_sir_hard_xmit;
369 dev->open = ali_ircc_net_open; 365 dev->open = ali_ircc_net_open;
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 3ca47bf6dfec..3e5eca1aa987 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1660,7 +1660,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
1660 } 1660 }
1661#endif 1661#endif
1662 1662
1663 SET_MODULE_OWNER(dev);
1664 SET_NETDEV_DEV(dev, &pci_dev->dev); 1663 SET_NETDEV_DEV(dev, &pci_dev->dev);
1665 dev->hard_start_xmit = toshoboe_hard_xmit; 1664 dev->hard_start_xmit = toshoboe_hard_xmit;
1666 dev->open = toshoboe_net_open; 1665 dev->open = toshoboe_net_open;
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 3b0fd83fa266..c6355c00fd7a 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1635,7 +1635,6 @@ static int irda_usb_probe(struct usb_interface *intf,
1635 if (!net) 1635 if (!net)
1636 goto err_out; 1636 goto err_out;
1637 1637
1638 SET_MODULE_OWNER(net);
1639 SET_NETDEV_DEV(net, &intf->dev); 1638 SET_NETDEV_DEV(net, &intf->dev);
1640 self = net->priv; 1639 self = net->priv;
1641 self->netdev = net; 1640 self->netdev = net;
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 20732458f5ac..c79caa5d3d71 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -175,8 +175,6 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
175 self->tx_buff.data = self->tx_buff.head; 175 self->tx_buff.data = self->tx_buff.head;
176 176
177 self->netdev = dev; 177 self->netdev = dev;
178 /* Keep track of module usage */
179 SET_MODULE_OWNER(dev);
180 178
181 /* May be overridden by piggyback drivers */ 179 /* May be overridden by piggyback drivers */
182 self->interrupt = irport_interrupt; 180 self->interrupt = irport_interrupt;
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index a4adb74cccd2..648e54b3f00e 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -487,7 +487,6 @@ static int kingsun_probe(struct usb_interface *intf,
487 if(!net) 487 if(!net)
488 goto err_out1; 488 goto err_out1;
489 489
490 SET_MODULE_OWNER(net);
491 SET_NETDEV_DEV(net, &intf->dev); 490 SET_NETDEV_DEV(net, &intf->dev);
492 kingsun = netdev_priv(net); 491 kingsun = netdev_priv(net);
493 kingsun->irlap = NULL; 492 kingsun->irlap = NULL;
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 407afba1a597..8c257a51341a 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -697,7 +697,6 @@ static int ks959_probe(struct usb_interface *intf,
697 if (!net) 697 if (!net)
698 goto err_out1; 698 goto err_out1;
699 699
700 SET_MODULE_OWNER(net);
701 SET_NETDEV_DEV(net, &intf->dev); 700 SET_NETDEV_DEV(net, &intf->dev);
702 kingsun = netdev_priv(net); 701 kingsun = netdev_priv(net);
703 kingsun->netdev = net; 702 kingsun->netdev = net;
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 12b0e7a15bef..af60f2435a38 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -628,7 +628,6 @@ static int ksdazzle_probe(struct usb_interface *intf,
628 if (!net) 628 if (!net)
629 goto err_out1; 629 goto err_out1;
630 630
631 SET_MODULE_OWNER(net);
632 SET_NETDEV_DEV(net, &intf->dev); 631 SET_NETDEV_DEV(net, &intf->dev);
633 kingsun = netdev_priv(net); 632 kingsun = netdev_priv(net);
634 kingsun->netdev = net; 633 kingsun->netdev = net;
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index bfc57525bd6a..808939b9f8fb 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -898,8 +898,6 @@ static int mcs_probe(struct usb_interface *intf,
898 898
899 IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum); 899 IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum);
900 900
901 /* what is it realy for? */
902 SET_MODULE_OWNER(ndev);
903 SET_NETDEV_DEV(ndev, &intf->dev); 901 SET_NETDEV_DEV(ndev, &intf->dev);
904 902
905 ret = usb_reset_configuration(udev); 903 ret = usb_reset_configuration(udev);
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index d96c89751a71..12b9378c587f 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -437,7 +437,6 @@ static int __init nsc_ircc_open(chipio_t *info)
437 self->tx_fifo.tail = self->tx_buff.head; 437 self->tx_fifo.tail = self->tx_buff.head;
438 438
439 /* Override the network functions we need to use */ 439 /* Override the network functions we need to use */
440 SET_MODULE_OWNER(dev);
441 dev->hard_start_xmit = nsc_ircc_hard_xmit_sir; 440 dev->hard_start_xmit = nsc_ircc_hard_xmit_sir;
442 dev->open = nsc_ircc_net_open; 441 dev->open = nsc_ircc_net_open;
443 dev->stop = nsc_ircc_net_close; 442 dev->stop = nsc_ircc_net_close;
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 9d6c8f391b2d..bbe4e094c424 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -913,8 +913,6 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n
913 dev->drv = drv; 913 dev->drv = drv;
914 dev->netdev = ndev; 914 dev->netdev = ndev;
915 915
916 SET_MODULE_OWNER(ndev);
917
918 /* Override the network functions we need to use */ 916 /* Override the network functions we need to use */
919 ndev->hard_start_xmit = sirdev_hard_xmit; 917 ndev->hard_start_xmit = sirdev_hard_xmit;
920 ndev->open = sirdev_open; 918 ndev->open = sirdev_open;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 36ab98386be0..029fdde2a4d3 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -519,8 +519,6 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
519 goto err_out1; 519 goto err_out1;
520 } 520 }
521 521
522 SET_MODULE_OWNER(dev);
523
524 dev->hard_start_xmit = smsc_ircc_hard_xmit_sir; 522 dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
525#if SMSC_IRCC2_C_NET_TIMEOUT 523#if SMSC_IRCC2_C_NET_TIMEOUT
526 dev->tx_timeout = smsc_ircc_timeout; 524 dev->tx_timeout = smsc_ircc_timeout;
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 755aa444a4dd..1afaee0fa7e0 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -1034,7 +1034,6 @@ static int stir_probe(struct usb_interface *intf,
1034 if(!net) 1034 if(!net)
1035 goto err_out1; 1035 goto err_out1;
1036 1036
1037 SET_MODULE_OWNER(net);
1038 SET_NETDEV_DEV(net, &intf->dev); 1037 SET_NETDEV_DEV(net, &intf->dev);
1039 stir = netdev_priv(net); 1038 stir = netdev_priv(net);
1040 stir->netdev = net; 1039 stir->netdev = net;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index ff5358574d0a..126ec7c8680e 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -429,9 +429,6 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
429 self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; 429 self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0;
430 self->tx_fifo.tail = self->tx_buff.head; 430 self->tx_fifo.tail = self->tx_buff.head;
431 431
432 /* Keep track of module usage */
433 SET_MODULE_OWNER(dev);
434
435 /* Override the network functions we need to use */ 432 /* Override the network functions we need to use */
436 dev->hard_start_xmit = via_ircc_hard_xmit_sir; 433 dev->hard_start_xmit = via_ircc_hard_xmit_sir;
437 dev->open = via_ircc_net_open; 434 dev->open = via_ircc_net_open;
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 0538ca9ce058..acd082a96a4f 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1584,8 +1584,6 @@ static int vlsi_irda_init(struct net_device *ndev)
1584 vlsi_irda_dev_t *idev = ndev->priv; 1584 vlsi_irda_dev_t *idev = ndev->priv;
1585 struct pci_dev *pdev = idev->pdev; 1585 struct pci_dev *pdev = idev->pdev;
1586 1586
1587 SET_MODULE_OWNER(ndev);
1588
1589 ndev->irq = pdev->irq; 1587 ndev->irq = pdev->irq;
1590 ndev->base_addr = pci_resource_start(pdev,0); 1588 ndev->base_addr = pci_resource_start(pdev,0);
1591 1589
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 5182e800cc18..9fd2451b0fb2 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -232,9 +232,6 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
232 self->rx_buff.data = self->rx_buff.head; 232 self->rx_buff.data = self->rx_buff.head;
233 self->netdev = dev; 233 self->netdev = dev;
234 234
235 /* Keep track of module usage */
236 SET_MODULE_OWNER(dev);
237
238 /* Override the network functions we need to use */ 235 /* Override the network functions we need to use */
239 dev->hard_start_xmit = w83977af_hard_xmit; 236 dev->hard_start_xmit = w83977af_hard_xmit;
240 dev->open = w83977af_net_open; 237 dev->open = w83977af_net_open;
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 0343f12d2ffb..54178111eec5 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -133,8 +133,6 @@ static int __init do_netcard_probe(struct net_device *dev)
133 int base_addr = dev->base_addr; 133 int base_addr = dev->base_addr;
134 int irq = dev->irq; 134 int irq = dev->irq;
135 135
136 SET_MODULE_OWNER(dev);
137
138 if (base_addr > 0x1ff) /* Check a single specified location. */ 136 if (base_addr > 0x1ff) /* Check a single specified location. */
139 return netcard_probe1(dev, base_addr); 137 return netcard_probe1(dev, base_addr);
140 else if (base_addr != 0) /* Don't probe at all. */ 138 else if (base_addr != 0) /* Don't probe at all. */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index e3f27c67fb28..d444de58ba34 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -382,7 +382,6 @@ ixgb_probe(struct pci_dev *pdev,
382 goto err_alloc_etherdev; 382 goto err_alloc_etherdev;
383 } 383 }
384 384
385 SET_MODULE_OWNER(netdev);
386 SET_NETDEV_DEV(netdev, &pdev->dev); 385 SET_NETDEV_DEV(netdev, &pdev->dev);
387 386
388 pci_set_drvdata(pdev, netdev); 387 pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index a08a46224c28..b75f1c6efc42 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2548,7 +2548,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
2548 goto err_alloc_etherdev; 2548 goto err_alloc_etherdev;
2549 } 2549 }
2550 2550
2551 SET_MODULE_OWNER(netdev);
2552 SET_NETDEV_DEV(netdev, &pdev->dev); 2551 SET_NETDEV_DEV(netdev, &pdev->dev);
2553 2552
2554 pci_set_drvdata(pdev, netdev); 2553 pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index d3f4235c585d..b02a981c87a8 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -210,7 +210,6 @@ static int __init enp2611_init_module(void)
210 return -ENOMEM; 210 return -ENOMEM;
211 } 211 }
212 212
213 SET_MODULE_OWNER(nds[i]);
214 nds[i]->get_stats = enp2611_get_stats; 213 nds[i]->get_stats = enp2611_get_stats;
215 pm3386_init_port(i); 214 pm3386_init_port(i);
216 pm3386_get_mac(i, nds[i]->dev_addr); 215 pm3386_get_mac(i, nds[i]->dev_addr);
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index b71e6633f42d..13847a3e43e5 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -221,7 +221,6 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
221 lp = netdev_priv(dev); 221 lp = netdev_priv(dev);
222 lp->device = &pdev->dev; 222 lp->device = &pdev->dev;
223 SET_NETDEV_DEV(dev, &pdev->dev); 223 SET_NETDEV_DEV(dev, &pdev->dev);
224 SET_MODULE_OWNER(dev);
225 224
226 netdev_boot_setup_check(dev); 225 netdev_boot_setup_check(dev);
227 226
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index a4e5fab12628..7b17212d687e 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -521,7 +521,6 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
521 521
522 /* We can't allocate dev->priv from alloc_etherdev() because it must 522 /* We can't allocate dev->priv from alloc_etherdev() because it must
523 a ISA DMA-able region. */ 523 a ISA DMA-able region. */
524 SET_MODULE_OWNER(dev);
525 chipname = chip_table[lance_version].name; 524 chipname = chip_table[lance_version].name;
526 printk("%s: %s at %#3x,", dev->name, chipname, ioaddr); 525 printk("%s: %s at %#3x,", dev->name, chipname, ioaddr);
527 526
diff --git a/drivers/net/lguest_net.c b/drivers/net/lguest_net.c
index cab57911a80e..7f34c92bcd86 100644
--- a/drivers/net/lguest_net.c
+++ b/drivers/net/lguest_net.c
@@ -460,8 +460,6 @@ static int lguestnet_probe(struct lguest_device *lgdev)
460 if (!dev) 460 if (!dev)
461 return -ENOMEM; 461 return -ENOMEM;
462 462
463 SET_MODULE_OWNER(dev);
464
465 /* Ethernet defaults with some changes */ 463 /* Ethernet defaults with some changes */
466 ether_setup(dev); 464 ether_setup(dev);
467 dev->set_mac_address = NULL; 465 dev->set_mac_address = NULL;
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 0a08d0c4e7b4..2dd396983213 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -111,8 +111,6 @@ static int __init do_lne390_probe(struct net_device *dev)
111 int mem_start = dev->mem_start; 111 int mem_start = dev->mem_start;
112 int ret; 112 int ret;
113 113
114 SET_MODULE_OWNER(dev);
115
116 if (ioaddr > 0x1ff) { /* Check a single specified location. */ 114 if (ioaddr > 0x1ff) { /* Check a single specified location. */
117 if (!request_region(ioaddr, LNE390_IO_EXTENT, DRV_NAME)) 115 if (!request_region(ioaddr, LNE390_IO_EXTENT, DRV_NAME))
118 return -EBUSY; 116 return -EBUSY;
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 90b0c3ed4bb6..9e700749bb31 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -313,8 +313,6 @@ struct net_device * __init mac8390_probe(int unit)
313 if (unit >= 0) 313 if (unit >= 0)
314 sprintf(dev->name, "eth%d", unit); 314 sprintf(dev->name, "eth%d", unit);
315 315
316 SET_MODULE_OWNER(dev);
317
318 while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, NUBUS_TYPE_ETHERNET, ndev))) { 316 while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, NUBUS_TYPE_ETHERNET, ndev))) {
319 /* Have we seen it already? */ 317 /* Have we seen it already? */
320 if (slots & (1<<ndev->board->slot)) 318 if (slots & (1<<ndev->board->slot))
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 62c1c6262feb..f6f3fdfe41db 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -191,8 +191,6 @@ struct net_device * __init mac89x0_probe(int unit)
191 netdev_boot_setup_check(dev); 191 netdev_boot_setup_check(dev);
192 } 192 }
193 193
194 SET_MODULE_OWNER(dev);
195
196 if (once_is_enough) 194 if (once_is_enough)
197 goto out; 195 goto out;
198 once_is_enough = 1; 196 once_is_enough = 1;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 74c3f7a7ae4a..c6707580c305 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1085,7 +1085,6 @@ static int __devinit macb_probe(struct platform_device *pdev)
1085 goto err_out; 1085 goto err_out;
1086 } 1086 }
1087 1087
1088 SET_MODULE_OWNER(dev);
1089 SET_NETDEV_DEV(dev, &pdev->dev); 1088 SET_NETDEV_DEV(dev, &pdev->dev);
1090 1089
1091 /* TODO: Actually, we have some interesting features... */ 1090 /* TODO: Actually, we have some interesting features... */
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 52b9332810c5..de3b002e9a4c 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -143,7 +143,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
143 rc = -ENOMEM; 143 rc = -ENOMEM;
144 goto err_release; 144 goto err_release;
145 } 145 }
146 SET_MODULE_OWNER(dev);
147 SET_NETDEV_DEV(dev, &mdev->ofdev.dev); 146 SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
148 147
149 mp = dev->priv; 148 mp = dev->priv;
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 9a343b965975..5d2daa248873 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -210,7 +210,6 @@ static int __devinit mace_probe(struct platform_device *pdev)
210 210
211 mp->device = &pdev->dev; 211 mp->device = &pdev->dev;
212 SET_NETDEV_DEV(dev, &pdev->dev); 212 SET_NETDEV_DEV(dev, &pdev->dev);
213 SET_MODULE_OWNER(dev);
214 213
215 dev->base_addr = (u32)MACE_BASE; 214 dev->base_addr = (u32)MACE_BASE;
216 mp->mace = (volatile struct mace *) MACE_BASE; 215 mp->mace = (volatile struct mace *) MACE_BASE;
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index e9ecdbf352ae..a55a8399344c 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -576,7 +576,6 @@ static int __init mac_sonic_probe(struct platform_device *pdev)
576 lp = netdev_priv(dev); 576 lp = netdev_priv(dev);
577 lp->device = &pdev->dev; 577 lp->device = &pdev->dev;
578 SET_NETDEV_DEV(dev, &pdev->dev); 578 SET_NETDEV_DEV(dev, &pdev->dev);
579 SET_MODULE_OWNER(dev);
580 579
581 /* This will catch fatal stuff like -ENOMEM as well as success */ 580 /* This will catch fatal stuff like -ENOMEM as well as success */
582 err = mac_onboard_sonic_probe(dev); 581 err = mac_onboard_sonic_probe(dev);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 702eba549161..6317bba9587c 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1425,7 +1425,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
1425 mv643xx_eth_update_pscr(dev, &cmd); 1425 mv643xx_eth_update_pscr(dev, &cmd);
1426 mv643xx_set_settings(dev, &cmd); 1426 mv643xx_set_settings(dev, &cmd);
1427 1427
1428 SET_MODULE_OWNER(dev);
1429 SET_NETDEV_DEV(dev, &pdev->dev); 1428 SET_NETDEV_DEV(dev, &pdev->dev);
1430 err = register_netdev(dev); 1429 err = register_netdev(dev);
1431 if (err) 1430 if (err)
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index e246d00bba6d..837ad0f2b05d 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -79,8 +79,6 @@ struct net_device * __init mvme147lance_probe(int unit)
79 if (unit >= 0) 79 if (unit >= 0)
80 sprintf(dev->name, "eth%d", unit); 80 sprintf(dev->name, "eth%d", unit);
81 81
82 SET_MODULE_OWNER(dev);
83
84 /* Fill the dev fields */ 82 /* Fill the dev fields */
85 dev->base_addr = (unsigned long)MVME147_LANCE_BASE; 83 dev->base_addr = (unsigned long)MVME147_LANCE_BASE;
86 dev->open = &m147lance_open; 84 dev->open = &m147lance_open;
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 13444da93273..331b76c49561 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -908,7 +908,6 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
908 if (version_printed++ == 0) 908 if (version_printed++ == 0)
909 printk(version); 909 printk(version);
910 910
911 SET_MODULE_OWNER(dev);
912 SET_NETDEV_DEV(dev, &sdev->ofdev.dev); 911 SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
913 912
914 mp = (struct myri_eth *) dev->priv; 913 mp = (struct myri_eth *) dev->priv;
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 43cfa4b3e294..5ee4e8795d23 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -837,7 +837,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
837 dev = alloc_etherdev(sizeof (struct netdev_private)); 837 dev = alloc_etherdev(sizeof (struct netdev_private));
838 if (!dev) 838 if (!dev)
839 return -ENOMEM; 839 return -ENOMEM;
840 SET_MODULE_OWNER(dev);
841 SET_NETDEV_DEV(dev, &pdev->dev); 840 SET_NETDEV_DEV(dev, &pdev->dev);
842 841
843 i = pci_request_regions(pdev, DRV_NAME); 842 i = pci_request_regions(pdev, DRV_NAME);
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index 38fd525f0f13..a0f35361fbec 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -149,8 +149,6 @@ static int __init do_ne_probe(struct net_device *dev)
149{ 149{
150 unsigned int base_addr = dev->base_addr; 150 unsigned int base_addr = dev->base_addr;
151 151
152 SET_MODULE_OWNER(dev);
153
154 /* First check any supplied i/o locations. User knows best. <cough> */ 152 /* First check any supplied i/o locations. User knows best. <cough> */
155 if (base_addr > 0x1ff) /* Check a single specified location. */ 153 if (base_addr > 0x1ff) /* Check a single specified location. */
156 return ne_probe1(dev, base_addr); 154 return ne_probe1(dev, base_addr);
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index c9f74bf5f491..c81befc3a7ae 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -191,8 +191,6 @@ static int __init do_ne_probe(struct net_device *dev)
191 int orig_irq = dev->irq; 191 int orig_irq = dev->irq;
192#endif 192#endif
193 193
194 SET_MODULE_OWNER(dev);
195
196 /* First check any supplied i/o locations. User knows best. <cough> */ 194 /* First check any supplied i/o locations. User knows best. <cough> */
197 if (base_addr > 0x1ff) /* Check a single specified location. */ 195 if (base_addr > 0x1ff) /* Check a single specified location. */
198 return ne_probe1(dev, base_addr); 196 return ne_probe1(dev, base_addr);
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 089b5bb702fc..d1a4b8d7122a 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -251,8 +251,6 @@ static int __init do_ne2_probe(struct net_device *dev)
251 int i; 251 int i;
252 int adapter_found = 0; 252 int adapter_found = 0;
253 253
254 SET_MODULE_OWNER(dev);
255
256 /* Do not check any supplied i/o locations. 254 /* Do not check any supplied i/o locations.
257 POS registers usually don't fail :) */ 255 POS registers usually don't fail :) */
258 256
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index f81d9398d605..230a0f1e03fb 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -265,7 +265,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
265 dev_err(&pdev->dev, "cannot allocate ethernet device\n"); 265 dev_err(&pdev->dev, "cannot allocate ethernet device\n");
266 goto err_out_free_res; 266 goto err_out_free_res;
267 } 267 }
268 SET_MODULE_OWNER(dev);
269 SET_NETDEV_DEV(dev, &pdev->dev); 268 SET_NETDEV_DEV(dev, &pdev->dev);
270 269
271 /* Reset card. Who knows what dain-bramaged state it was left in. */ 270 /* Reset card. Who knows what dain-bramaged state it was left in. */
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index 1a6fed76d4cc..b1bf8331e872 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -106,7 +106,6 @@ static int __init ne3210_eisa_probe (struct device *device)
106 return -ENOMEM; 106 return -ENOMEM;
107 } 107 }
108 108
109 SET_MODULE_OWNER(dev);
110 SET_NETDEV_DEV(dev, device); 109 SET_NETDEV_DEV(dev, device);
111 device->driver_data = dev; 110 device->driver_data = dev;
112 ioaddr = edev->base_addr; 111 ioaddr = edev->base_addr;
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index 2b8da0a54998..6fee405d8403 100644
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -390,7 +390,6 @@ static int netx_eth_drv_probe(struct platform_device *pdev)
390 ret = -ENOMEM; 390 ret = -ENOMEM;
391 goto exit; 391 goto exit;
392 } 392 }
393 SET_MODULE_OWNER(ndev);
394 SET_NETDEV_DEV(ndev, &pdev->dev); 393 SET_NETDEV_DEV(ndev, &pdev->dev);
395 394
396 platform_set_drvdata(pdev, ndev); 395 platform_set_drvdata(pdev, ndev);
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index dcd66a6b4904..1b165a8c74f3 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -325,7 +325,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
325 goto err_out_free_res; 325 goto err_out_free_res;
326 } 326 }
327 327
328 SET_MODULE_OWNER(netdev);
329 SET_NETDEV_DEV(netdev, &pdev->dev); 328 SET_NETDEV_DEV(netdev, &pdev->dev);
330 329
331 adapter = netdev->priv; 330 adapter = netdev->priv;
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 22a3b3dc7d89..cc1d09a21c0c 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -135,8 +135,6 @@ struct net_device * __init ni5010_probe(int unit)
135 135
136 PRINTK2((KERN_DEBUG "%s: Entering ni5010_probe\n", dev->name)); 136 PRINTK2((KERN_DEBUG "%s: Entering ni5010_probe\n", dev->name));
137 137
138 SET_MODULE_OWNER(dev);
139
140 if (io > 0x1ff) { /* Check a single specified location. */ 138 if (io > 0x1ff) { /* Check a single specified location. */
141 err = ni5010_probe1(dev, io); 139 err = ni5010_probe1(dev, io);
142 } else if (io != 0) { /* Don't probe at all. */ 140 } else if (io != 0) { /* Don't probe at all. */
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 5e7999db2096..6b3384a24f07 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -382,8 +382,6 @@ struct net_device * __init ni52_probe(int unit)
382 memend = dev->mem_end; 382 memend = dev->mem_end;
383 } 383 }
384 384
385 SET_MODULE_OWNER(dev);
386
387 if (io > 0x1ff) { /* Check a single specified location. */ 385 if (io > 0x1ff) { /* Check a single specified location. */
388 err = ni52_probe1(dev, io); 386 err = ni52_probe1(dev, io);
389 } else if (io > 0) { /* Don't probe at all. */ 387 } else if (io > 0) { /* Don't probe at all. */
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 4ef5fe345191..097685245112 100644
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -550,7 +550,6 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr)
550 } 550 }
551 551
552 dev->base_addr = ioaddr; 552 dev->base_addr = ioaddr;
553 SET_MODULE_OWNER(dev);
554 dev->open = ni65_open; 553 dev->open = ni65_open;
555 dev->stop = ni65_close; 554 dev->stop = ni65_close;
556 dev->hard_start_xmit = ni65_send_packet; 555 dev->hard_start_xmit = ni65_send_packet;
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 6e65d61a3fe0..de495b697294 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1988,7 +1988,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
1988 spin_lock_init(&dev->misc_lock); 1988 spin_lock_init(&dev->misc_lock);
1989 dev->pci_dev = pci_dev; 1989 dev->pci_dev = pci_dev;
1990 1990
1991 SET_MODULE_OWNER(ndev);
1992 SET_NETDEV_DEV(ndev, &pci_dev->dev); 1991 SET_NETDEV_DEV(ndev, &pci_dev->dev);
1993 1992
1994 INIT_WORK(&dev->tq_refill, queue_refill); 1993 INIT_WORK(&dev->tq_refill, queue_refill);
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 48c117038fef..723685ee57aa 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1176,7 +1176,6 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1176 goto out_disable_device; 1176 goto out_disable_device;
1177 } 1177 }
1178 1178
1179 SET_MODULE_OWNER(dev);
1180 pci_set_drvdata(pdev, dev); 1179 pci_set_drvdata(pdev, dev);
1181 SET_NETDEV_DEV(dev, &pdev->dev); 1180 SET_NETDEV_DEV(dev, &pdev->dev);
1182 1181
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 3cdbe118200b..a4b16484a5f7 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -604,7 +604,6 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
604 DPRINTK ("EXIT, returning -ENOMEM\n"); 604 DPRINTK ("EXIT, returning -ENOMEM\n");
605 return -ENOMEM; 605 return -ENOMEM;
606 } 606 }
607 SET_MODULE_OWNER(dev);
608 SET_NETDEV_DEV(dev, &pdev->dev); 607 SET_NETDEV_DEV(dev, &pdev->dev);
609 tp = dev->priv; 608 tp = dev->priv;
610 609
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 503f2685fb73..2136c80c0581 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -197,7 +197,6 @@ static int tc589_probe(struct pcmcia_device *link)
197 link->conf.ConfigIndex = 1; 197 link->conf.ConfigIndex = 1;
198 198
199 /* The EL3-specific entries in the device structure. */ 199 /* The EL3-specific entries in the device structure. */
200 SET_MODULE_OWNER(dev);
201 dev->hard_start_xmit = &el3_start_xmit; 200 dev->hard_start_xmit = &el3_start_xmit;
202 dev->set_config = &el3_config; 201 dev->set_config = &el3_config;
203 dev->get_stats = &el3_get_stats; 202 dev->get_stats = &el3_get_stats;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 50dff1b81d34..a9db59d2a2f1 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1728,9 +1728,6 @@ static void axdev_setup(struct net_device *dev)
1728 if (ei_debug > 1) 1728 if (ei_debug > 1)
1729 printk(version_8390); 1729 printk(version_8390);
1730 1730
1731 SET_MODULE_OWNER(dev);
1732
1733
1734 ei_local = (struct ei_device *)netdev_priv(dev); 1731 ei_local = (struct ei_device *)netdev_priv(dev);
1735 spin_lock_init(&ei_local->page_lock); 1732 spin_lock_init(&ei_local->page_lock);
1736 1733
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 85d5f2ca4bb5..7f29e95a0644 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -259,7 +259,6 @@ static int fmvj18x_probe(struct pcmcia_device *link)
259 link->conf.IntType = INT_MEMORY_AND_IO; 259 link->conf.IntType = INT_MEMORY_AND_IO;
260 260
261 /* The FMVJ18x specific entries in the device structure. */ 261 /* The FMVJ18x specific entries in the device structure. */
262 SET_MODULE_OWNER(dev);
263 dev->hard_start_xmit = &fjn_start_xmit; 262 dev->hard_start_xmit = &fjn_start_xmit;
264 dev->set_config = &fjn_config; 263 dev->set_config = &fjn_config;
265 dev->get_stats = &fjn_get_stats; 264 dev->get_stats = &fjn_get_stats;
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 997c2d0c83bb..1bb2ffa294de 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -474,7 +474,6 @@ static int nmclan_probe(struct pcmcia_device *link)
474 474
475 lp->tx_free_frames=AM2150_MAX_TX_FRAMES; 475 lp->tx_free_frames=AM2150_MAX_TX_FRAMES;
476 476
477 SET_MODULE_OWNER(dev);
478 dev->hard_start_xmit = &mace_start_xmit; 477 dev->hard_start_xmit = &mace_start_xmit;
479 dev->set_config = &mace_config; 478 dev->set_config = &mace_config;
480 dev->get_stats = &mace_get_stats; 479 dev->get_stats = &mace_get_stats;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 63de89e93b70..49857c1b5067 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -259,7 +259,6 @@ static int pcnet_probe(struct pcmcia_device *link)
259 link->conf.Attributes = CONF_ENABLE_IRQ; 259 link->conf.Attributes = CONF_ENABLE_IRQ;
260 link->conf.IntType = INT_MEMORY_AND_IO; 260 link->conf.IntType = INT_MEMORY_AND_IO;
261 261
262 SET_MODULE_OWNER(dev);
263 dev->open = &pcnet_open; 262 dev->open = &pcnet_open;
264 dev->stop = &pcnet_close; 263 dev->stop = &pcnet_close;
265 dev->set_config = &set_config; 264 dev->set_config = &set_config;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index af6728cb49c3..b25f1985d03e 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -336,7 +336,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
336 link->conf.IntType = INT_MEMORY_AND_IO; 336 link->conf.IntType = INT_MEMORY_AND_IO;
337 337
338 /* The SMC91c92-specific entries in the device structure. */ 338 /* The SMC91c92-specific entries in the device structure. */
339 SET_MODULE_OWNER(dev);
340 dev->hard_start_xmit = &smc_start_xmit; 339 dev->hard_start_xmit = &smc_start_xmit;
341 dev->get_stats = &smc_get_stats; 340 dev->get_stats = &smc_get_stats;
342 dev->set_config = &s9k_config; 341 dev->set_config = &s9k_config;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 258d6f396186..d5c2d2c8c852 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -580,7 +580,6 @@ xirc2ps_probe(struct pcmcia_device *link)
580 link->irq.Instance = dev; 580 link->irq.Instance = dev;
581 581
582 /* Fill in card specific entries */ 582 /* Fill in card specific entries */
583 SET_MODULE_OWNER(dev);
584 dev->hard_start_xmit = &do_start_xmit; 583 dev->hard_start_xmit = &do_start_xmit;
585 dev->set_config = &do_config; 584 dev->set_config = &do_config;
586 dev->get_stats = &do_get_stats; 585 dev->get_stats = &do_get_stats;
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index db87429b956f..724d90bd1feb 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1822,7 +1822,6 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
1822 1822
1823 spin_lock_init(&lp->lock); 1823 spin_lock_init(&lp->lock);
1824 1824
1825 SET_MODULE_OWNER(dev);
1826 SET_NETDEV_DEV(dev, &pdev->dev); 1825 SET_NETDEV_DEV(dev, &pdev->dev);
1827 lp->name = chipname; 1826 lp->name = chipname;
1828 lp->shared_irq = shared; 1827 lp->shared_irq = shared;
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 8754cf3356b0..2cfab4b36654 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -1278,7 +1278,6 @@ static void plip_attach (struct parport *port)
1278 1278
1279 strcpy(dev->name, name); 1279 strcpy(dev->name, name);
1280 1280
1281 SET_MODULE_OWNER(dev);
1282 dev->irq = port->irq; 1281 dev->irq = port->irq;
1283 dev->base_addr = port->base; 1282 dev->base_addr = port->base;
1284 if (port->irq == -1) { 1283 if (port->irq == -1) {
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 93c2c39a4a49..f375bbbd6604 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1349,7 +1349,6 @@ static int gelic_net_setup_netdev(struct gelic_net_card *card)
1349 int status; 1349 int status;
1350 u64 v1, v2; 1350 u64 v1, v2;
1351 1351
1352 SET_MODULE_OWNER(netdev);
1353 SET_NETDEV_DEV(netdev, &card->dev->core); 1352 SET_NETDEV_DEV(netdev, &card->dev->core);
1354 spin_lock_init(&card->tx_dma_lock); 1353 spin_lock_init(&card->tx_dma_lock);
1355 1354
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index e39232320e34..309199bb7d12 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -4011,7 +4011,6 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
4011 goto err_out_free_regions; 4011 goto err_out_free_regions;
4012 } 4012 }
4013 4013
4014 SET_MODULE_OWNER(ndev);
4015 SET_NETDEV_DEV(ndev, &pdev->dev); 4014 SET_NETDEV_DEV(ndev, &pdev->dev);
4016 4015
4017 pci_set_drvdata(pdev, ndev); 4016 pci_set_drvdata(pdev, ndev);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 3f2306e3f517..b8809a8ef204 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1506,7 +1506,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1506 goto out; 1506 goto out;
1507 } 1507 }
1508 1508
1509 SET_MODULE_OWNER(dev);
1510 SET_NETDEV_DEV(dev, &pdev->dev); 1509 SET_NETDEV_DEV(dev, &pdev->dev);
1511 tp = netdev_priv(dev); 1510 tp = netdev_priv(dev);
1512 tp->dev = dev; 1511 tp->dev = dev;
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index df6b73872fdb..25a9dd821aa2 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -471,8 +471,6 @@ static int rionet_setup_netdev(struct rio_mport *mport)
471 ndev->features = NETIF_F_LLTX; 471 ndev->features = NETIF_F_LLTX;
472 SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops); 472 SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);
473 473
474 SET_MODULE_OWNER(ndev);
475
476 spin_lock_init(&rnet->lock); 474 spin_lock_init(&rnet->lock);
477 spin_lock_init(&rnet->tx_lock); 475 spin_lock_init(&rnet->tx_lock);
478 476
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 5c2e41fac6d2..41f877d482c7 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -109,7 +109,6 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
109 109
110 rrpriv = netdev_priv(dev); 110 rrpriv = netdev_priv(dev);
111 111
112 SET_MODULE_OWNER(dev);
113 SET_NETDEV_DEV(dev, &pdev->dev); 112 SET_NETDEV_DEV(dev, &pdev->dev);
114 113
115 if (pci_request_regions(pdev, "rrunner")) { 114 if (pci_request_regions(pdev, "rrunner")) {
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ac6b9b93c025..f77049b34e16 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7463,7 +7463,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
7463 7463
7464 pci_set_master(pdev); 7464 pci_set_master(pdev);
7465 pci_set_drvdata(pdev, dev); 7465 pci_set_drvdata(pdev, dev);
7466 SET_MODULE_OWNER(dev);
7467 SET_NETDEV_DEV(dev, &pdev->dev); 7466 SET_NETDEV_DEV(dev, &pdev->dev);
7468 7467
7469 /* Private member variable initialized to s2io NIC structure */ 7468 /* Private member variable initialized to s2io NIC structure */
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 1de3eec1a792..aeaa75f549e6 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -189,7 +189,6 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
189 */ 189 */
190 dev->flags = IFF_POINTOPOINT|IFF_NOARP; 190 dev->flags = IFF_POINTOPOINT|IFF_NOARP;
191 191
192 SET_MODULE_OWNER(dev);
193 SET_NETDEV_DEV(dev, &pdev->dev); 192 SET_NETDEV_DEV(dev, &pdev->dev);
194 193
195 if (sb1000_debug > 0) 194 if (sb1000_debug > 0)
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index 3773b3858bd4..b56721a68a85 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -533,8 +533,6 @@ static void __init shaper_setup(struct net_device *dev)
533 * Set up the shaper. 533 * Set up the shaper.
534 */ 534 */
535 535
536 SET_MODULE_OWNER(dev);
537
538 shaper_init_priv(dev); 536 shaper_init_priv(dev);
539 537
540 dev->open = shaper_open; 538 dev->open = shaper_open;
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 038ccfbafdd1..e810ae942cd6 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1421,7 +1421,6 @@ static struct net_device * __devinit sis190_init_board(struct pci_dev *pdev)
1421 goto err_out_0; 1421 goto err_out_0;
1422 } 1422 }
1423 1423
1424 SET_MODULE_OWNER(dev);
1425 SET_NETDEV_DEV(dev, &pdev->dev); 1424 SET_NETDEV_DEV(dev, &pdev->dev);
1426 1425
1427 tp = netdev_priv(dev); 1426 tp = netdev_priv(dev);
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 7c6e4808399a..e1930c3ee75d 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -430,7 +430,6 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
430 net_dev = alloc_etherdev(sizeof(struct sis900_private)); 430 net_dev = alloc_etherdev(sizeof(struct sis900_private));
431 if (!net_dev) 431 if (!net_dev)
432 return -ENOMEM; 432 return -ENOMEM;
433 SET_MODULE_OWNER(net_dev);
434 SET_NETDEV_DEV(net_dev, &pci_dev->dev); 433 SET_NETDEV_DEV(net_dev, &pci_dev->dev);
435 434
436 /* We do a request_region() to register /proc/ioports info. */ 435 /* We do a request_region() to register /proc/ioports info. */
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 7dc9c9ebf5e7..20890e44f99a 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -4877,7 +4877,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
4877 goto out_free_netdev; 4877 goto out_free_netdev;
4878 } 4878 }
4879 4879
4880 SET_MODULE_OWNER(dev);
4881 dev->open = &SkGeOpen; 4880 dev->open = &SkGeOpen;
4882 dev->stop = &SkGeClose; 4881 dev->stop = &SkGeClose;
4883 dev->hard_start_xmit = &SkGeXmit; 4882 dev->hard_start_xmit = &SkGeXmit;
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index a7ef6c8b7721..ca508708229d 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -262,7 +262,6 @@ static int skfp_init_one(struct pci_dev *pdev,
262 dev->do_ioctl = &skfp_ioctl; 262 dev->do_ioctl = &skfp_ioctl;
263 dev->header_cache_update = NULL; /* not supported */ 263 dev->header_cache_update = NULL; /* not supported */
264 264
265 SET_MODULE_OWNER(dev);
266 SET_NETDEV_DEV(dev, &pdev->dev); 265 SET_NETDEV_DEV(dev, &pdev->dev);
267 266
268 /* Initialize board structure with bus-specific info */ 267 /* Initialize board structure with bus-specific info */
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 0bf46ed4e684..47a144d000d5 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3549,7 +3549,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
3549 return NULL; 3549 return NULL;
3550 } 3550 }
3551 3551
3552 SET_MODULE_OWNER(dev);
3553 SET_NETDEV_DEV(dev, &hw->pdev->dev); 3552 SET_NETDEV_DEV(dev, &hw->pdev->dev);
3554 dev->open = skge_up; 3553 dev->open = skge_up;
3555 dev->stop = skge_down; 3554 dev->stop = skge_down;
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 941a60882526..1b9e5f40ddee 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3924,7 +3924,6 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
3924 return NULL; 3924 return NULL;
3925 } 3925 }
3926 3926
3927 SET_MODULE_OWNER(dev);
3928 SET_NETDEV_DEV(dev, &hw->pdev->dev); 3927 SET_NETDEV_DEV(dev, &hw->pdev->dev);
3929 dev->irq = hw->pdev->irq; 3928 dev->irq = hw->pdev->irq;
3930 dev->open = sky2_up; 3929 dev->open = sky2_up;
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 3fd4735006f5..335b7cc80eba 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -639,8 +639,6 @@ static void sl_setup(struct net_device *dev)
639 dev->addr_len = 0; 639 dev->addr_len = 0;
640 dev->tx_queue_len = 10; 640 dev->tx_queue_len = 10;
641 641
642 SET_MODULE_OWNER(dev);
643
644 /* New-style flags. */ 642 /* New-style flags. */
645 dev->flags = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST; 643 dev->flags = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
646} 644}
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index ae1ae343beed..3b43fa8fd088 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -264,7 +264,6 @@ static int __init ultramca_probe(struct device *gen_dev)
264 if(!dev) 264 if(!dev)
265 return -ENODEV; 265 return -ENODEV;
266 266
267 SET_MODULE_OWNER(dev);
268 SET_NETDEV_DEV(dev, gen_dev); 267 SET_NETDEV_DEV(dev, gen_dev);
269 mca_device_set_name(mca_dev, smc_mca_adapter_names[adapter]); 268 mca_device_set_name(mca_dev, smc_mca_adapter_names[adapter]);
270 mca_device_set_claim(mca_dev, 1); 269 mca_device_set_claim(mca_dev, 1);
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index a52b22d7db65..d02bd7bc1bae 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -142,8 +142,6 @@ static int __init do_ultra_probe(struct net_device *dev)
142 int base_addr = dev->base_addr; 142 int base_addr = dev->base_addr;
143 int irq = dev->irq; 143 int irq = dev->irq;
144 144
145 SET_MODULE_OWNER(dev);
146
147#ifdef CONFIG_NET_POLL_CONTROLLER 145#ifdef CONFIG_NET_POLL_CONTROLLER
148 dev->poll_controller = &ultra_poll; 146 dev->poll_controller = &ultra_poll;
149#endif 147#endif
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 88a30e56c64c..043a5002029c 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -132,8 +132,6 @@ struct net_device * __init ultra32_probe(int unit)
132 netdev_boot_setup_check(dev); 132 netdev_boot_setup_check(dev);
133 } 133 }
134 134
135 SET_MODULE_OWNER(dev);
136
137 irq = dev->irq; 135 irq = dev->irq;
138 136
139 /* EISA spec allows for up to 16 slots, but 8 is typical. */ 137 /* EISA spec allows for up to 16 slots, but 8 is typical. */
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index db43e42bee35..5f03e44ad135 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -2181,7 +2181,6 @@ static int smc911x_drv_probe(struct platform_device *pdev)
2181 ret = -ENOMEM; 2181 ret = -ENOMEM;
2182 goto release_1; 2182 goto release_1;
2183 } 2183 }
2184 SET_MODULE_OWNER(ndev);
2185 SET_NETDEV_DEV(ndev, &pdev->dev); 2184 SET_NETDEV_DEV(ndev, &pdev->dev);
2186 2185
2187 ndev->dma = (unsigned char)-1; 2186 ndev->dma = (unsigned char)-1;
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 36c1ebadbf20..0a79516d196e 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -744,8 +744,6 @@ struct net_device * __init smc_init(int unit)
744 irq = dev->irq; 744 irq = dev->irq;
745 } 745 }
746 746
747 SET_MODULE_OWNER(dev);
748
749 if (io > 0x1ff) { /* Check a single specified location. */ 747 if (io > 0x1ff) { /* Check a single specified location. */
750 err = smc_probe(dev, io); 748 err = smc_probe(dev, io);
751 } else if (io != 0) { /* Don't probe at all. */ 749 } else if (io != 0) { /* Don't probe at all. */
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 01cc3c742c38..c5837ab5c96b 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2212,7 +2212,6 @@ static int smc_drv_probe(struct platform_device *pdev)
2212 ret = -ENOMEM; 2212 ret = -ENOMEM;
2213 goto out_release_io; 2213 goto out_release_io;
2214 } 2214 }
2215 SET_MODULE_OWNER(ndev);
2216 SET_NETDEV_DEV(ndev, &pdev->dev); 2215 SET_NETDEV_DEV(ndev, &pdev->dev);
2217 2216
2218 ndev->dma = (unsigned char)-1; 2217 ndev->dma = (unsigned char)-1;
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 6d8f2bb7e0f9..edc736eb3b86 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -2324,7 +2324,6 @@ spider_net_setup_netdev(struct spider_net_card *card)
2324 struct sockaddr addr; 2324 struct sockaddr addr;
2325 const u8 *mac; 2325 const u8 *mac;
2326 2326
2327 SET_MODULE_OWNER(netdev);
2328 SET_NETDEV_DEV(netdev, &card->pdev->dev); 2327 SET_NETDEV_DEV(netdev, &card->pdev->dev);
2329 2328
2330 pci_set_drvdata(card->pdev, netdev); 2329 pci_set_drvdata(card->pdev, netdev);
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 3b9336c34206..5785429ca0e2 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -719,7 +719,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
719 printk(KERN_ERR DRV_NAME " %d: cannot alloc etherdev, aborting\n", card_idx); 719 printk(KERN_ERR DRV_NAME " %d: cannot alloc etherdev, aborting\n", card_idx);
720 return -ENOMEM; 720 return -ENOMEM;
721 } 721 }
722 SET_MODULE_OWNER(dev);
723 SET_NETDEV_DEV(dev, &pdev->dev); 722 SET_NETDEV_DEV(dev, &pdev->dev);
724 723
725 irq = pdev->irq; 724 irq = pdev->irq;
diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c
index e6f90427160c..b65be5d70fec 100644
--- a/drivers/net/stnic.c
+++ b/drivers/net/stnic.c
@@ -112,7 +112,6 @@ static int __init stnic_probe(void)
112 dev = alloc_ei_netdev(); 112 dev = alloc_ei_netdev();
113 if (!dev) 113 if (!dev)
114 return -ENOMEM; 114 return -ENOMEM;
115 SET_MODULE_OWNER(dev);
116 115
117#ifdef CONFIG_SH_STANDARD_BIOS 116#ifdef CONFIG_SH_STANDARD_BIOS
118 sh_bios_get_node_addr (stnic_eadr); 117 sh_bios_get_node_addr (stnic_eadr);
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index b77ab6e8fd35..9b2a7f7bb258 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -311,7 +311,6 @@ struct net_device * __init sun3_82586_probe(int unit)
311 sprintf(dev->name, "eth%d", unit); 311 sprintf(dev->name, "eth%d", unit);
312 netdev_boot_setup_check(dev); 312 netdev_boot_setup_check(dev);
313 } 313 }
314 SET_MODULE_OWNER(dev);
315 314
316 dev->irq = IE_IRQ; 315 dev->irq = IE_IRQ;
317 dev->base_addr = ioaddr; 316 dev->base_addr = ioaddr;
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index f1548c033327..c67632dcac49 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -274,7 +274,6 @@ struct net_device * __init sun3lance_probe(int unit)
274 sprintf(dev->name, "eth%d", unit); 274 sprintf(dev->name, "eth%d", unit);
275 netdev_boot_setup_check(dev); 275 netdev_boot_setup_check(dev);
276 } 276 }
277 SET_MODULE_OWNER(dev);
278 277
279 if (!lance_probe(dev)) 278 if (!lance_probe(dev))
280 goto out; 279 goto out;
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index b3e0158def4f..4ba3e4857e90 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1087,7 +1087,6 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)
1087 dev = alloc_etherdev(sizeof(struct bigmac)); 1087 dev = alloc_etherdev(sizeof(struct bigmac));
1088 if (!dev) 1088 if (!dev)
1089 return -ENOMEM; 1089 return -ENOMEM;
1090 SET_MODULE_OWNER(dev);
1091 1090
1092 if (version_printed++ == 0) 1091 if (version_printed++ == 0)
1093 printk(KERN_INFO "%s", version); 1092 printk(KERN_INFO "%s", version);
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index a8f2af8f778a..3c553dcc2b9d 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -485,7 +485,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
485 dev = alloc_etherdev(sizeof(*np)); 485 dev = alloc_etherdev(sizeof(*np));
486 if (!dev) 486 if (!dev)
487 return -ENOMEM; 487 return -ENOMEM;
488 SET_MODULE_OWNER(dev);
489 SET_NETDEV_DEV(dev, &pdev->dev); 488 SET_NETDEV_DEV(dev, &pdev->dev);
490 489
491 if (pci_request_regions(pdev, DRV_NAME)) 490 if (pci_request_regions(pdev, DRV_NAME))
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index bf821e96f7b2..869ac44c51f3 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -3023,7 +3023,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
3023 err = -ENOMEM; 3023 err = -ENOMEM;
3024 goto err_disable_device; 3024 goto err_disable_device;
3025 } 3025 }
3026 SET_MODULE_OWNER(dev);
3027 SET_NETDEV_DEV(dev, &pdev->dev); 3026 SET_NETDEV_DEV(dev, &pdev->dev);
3028 3027
3029 gp = dev->priv; 3028 gp = dev->priv;
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 8b35f13318ea..170580c13127 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2680,7 +2680,6 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
2680 dev = alloc_etherdev(sizeof(struct happy_meal)); 2680 dev = alloc_etherdev(sizeof(struct happy_meal));
2681 if (!dev) 2681 if (!dev)
2682 goto err_out; 2682 goto err_out;
2683 SET_MODULE_OWNER(dev);
2684 SET_NETDEV_DEV(dev, &sdev->ofdev.dev); 2683 SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
2685 2684
2686 if (hme_version_printed++ == 0) 2685 if (hme_version_printed++ == 0)
@@ -3022,7 +3021,6 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3022 err = -ENOMEM; 3021 err = -ENOMEM;
3023 if (!dev) 3022 if (!dev)
3024 goto err_out; 3023 goto err_out;
3025 SET_MODULE_OWNER(dev);
3026 SET_NETDEV_DEV(dev, &pdev->dev); 3024 SET_NETDEV_DEV(dev, &pdev->dev);
3027 3025
3028 if (hme_version_printed++ == 0) 3026 if (hme_version_printed++ == 0)
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index e94b752f9f34..17d66c1185cd 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1457,7 +1457,6 @@ no_link_test:
1457 lp->dregs = NULL; 1457 lp->dregs = NULL;
1458 1458
1459 lp->dev = dev; 1459 lp->dev = dev;
1460 SET_MODULE_OWNER(dev);
1461 SET_NETDEV_DEV(dev, &sdev->ofdev.dev); 1460 SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
1462 dev->open = &lance_open; 1461 dev->open = &lance_open;
1463 dev->stop = &lance_close; 1462 dev->stop = &lance_close;
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 1b65ae8a1c7c..b5c2974fd625 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -898,7 +898,6 @@ static int __init qec_ether_init(struct sbus_dev *sdev)
898 /* Stop this QE. */ 898 /* Stop this QE. */
899 qe_stop(qe); 899 qe_stop(qe);
900 900
901 SET_MODULE_OWNER(dev);
902 SET_NETDEV_DEV(dev, &sdev->ofdev.dev); 901 SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
903 902
904 dev->open = qe_open; 903 dev->open = qe_open;
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index b5e0dff67230..df8237360f58 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -685,7 +685,6 @@ static int __devinit tc35815_init_one (struct pci_dev *pdev,
685 dev_err(&pdev->dev, "unable to alloc new ethernet\n"); 685 dev_err(&pdev->dev, "unable to alloc new ethernet\n");
686 return -ENOMEM; 686 return -ENOMEM;
687 } 687 }
688 SET_MODULE_OWNER(dev);
689 SET_NETDEV_DEV(dev, &pdev->dev); 688 SET_NETDEV_DEV(dev, &pdev->dev);
690 lp = dev->priv; 689 lp = dev->priv;
691 lp->dev = dev; 690 lp->dev = dev;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cbfa4df09592..369a172a04aa 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11826,7 +11826,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
11826 goto err_out_free_res; 11826 goto err_out_free_res;
11827 } 11827 }
11828 11828
11829 SET_MODULE_OWNER(dev);
11830 SET_NETDEV_DEV(dev, &pdev->dev); 11829 SET_NETDEV_DEV(dev, &pdev->dev);
11831 11830
11832#if TG3_VLAN_TAG_USED 11831#if TG3_VLAN_TAG_USED
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 74eb12107e68..c99ce74a7aff 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -556,7 +556,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
556 rc = -ENOMEM; 556 rc = -ENOMEM;
557 goto err_out_regions; 557 goto err_out_regions;
558 } 558 }
559 SET_MODULE_OWNER(dev);
560 SET_NETDEV_DEV(dev, &pdev->dev); 559 SET_NETDEV_DEV(dev, &pdev->dev);
561 560
562 priv = netdev_priv(dev); 561 priv = netdev_priv(dev);
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index f4251d35599d..88d03c085d54 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -344,7 +344,6 @@ static int __devinit xl_probe(struct pci_dev *pdev,
344 dev->set_multicast_list=&xl_set_rx_mode; 344 dev->set_multicast_list=&xl_set_rx_mode;
345 dev->get_stats=&xl_get_stats ; 345 dev->get_stats=&xl_get_stats ;
346 dev->set_mac_address=&xl_set_mac_address ; 346 dev->set_mac_address=&xl_set_mac_address ;
347 SET_MODULE_OWNER(dev);
348 SET_NETDEV_DEV(dev, &pdev->dev); 347 SET_NETDEV_DEV(dev, &pdev->dev);
349 348
350 pci_set_drvdata(pdev,dev) ; 349 pci_set_drvdata(pdev,dev) ;
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 1bdd3beefbe5..22fad5112406 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -116,8 +116,6 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
116 if (!dev) 116 if (!dev)
117 return -ENOMEM; 117 return -ENOMEM;
118 118
119 SET_MODULE_OWNER(dev);
120
121 if (!request_region(pci_ioaddr, ABYSS_IO_EXTENT, dev->name)) { 119 if (!request_region(pci_ioaddr, ABYSS_IO_EXTENT, dev->name)) {
122 ret = -EBUSY; 120 ret = -EBUSY;
123 goto err_out_trdev; 121 goto err_out_trdev;
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 49c4270ef5f7..f114fb729f54 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -245,7 +245,6 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
245 return -ENOMEM; 245 return -ENOMEM;
246 } 246 }
247 247
248 SET_MODULE_OWNER(dev);
249 streamer_priv = netdev_priv(dev); 248 streamer_priv = netdev_priv(dev);
250 249
251#if STREAMER_NETWORK_MONITOR 250#if STREAMER_NETWORK_MONITOR
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 9eafc2e25abc..d0ce2ce675d5 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -168,7 +168,6 @@ static int __devinit madgemc_probe(struct device *device)
168 goto getout; 168 goto getout;
169 } 169 }
170 170
171 SET_MODULE_OWNER(dev);
172 dev->dma = 0; 171 dev->dma = 0;
173 172
174 card = kmalloc(sizeof(struct card_info), GFP_KERNEL); 173 card = kmalloc(sizeof(struct card_info), GFP_KERNEL);
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index b57f65b2591a..a149d5e2965c 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -261,7 +261,6 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
261 dev->set_multicast_list=&olympic_set_rx_mode; 261 dev->set_multicast_list=&olympic_set_rx_mode;
262 dev->get_stats=&olympic_get_stats ; 262 dev->get_stats=&olympic_get_stats ;
263 dev->set_mac_address=&olympic_set_mac_address ; 263 dev->set_mac_address=&olympic_set_mac_address ;
264 SET_MODULE_OWNER(dev) ;
265 SET_NETDEV_DEV(dev, &pdev->dev); 264 SET_NETDEV_DEV(dev, &pdev->dev);
266 265
267 pci_set_drvdata(pdev,dev) ; 266 pci_set_drvdata(pdev,dev) ;
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index cb7dbb63c9d9..85d156dea033 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -126,7 +126,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
126 if (!dev) 126 if (!dev)
127 return -ENOMEM; 127 return -ENOMEM;
128 128
129 SET_MODULE_OWNER(dev);
130 if (dev->base_addr) /* probe specific location */ 129 if (dev->base_addr) /* probe specific location */
131 err = proteon_probe1(dev, dev->base_addr); 130 err = proteon_probe1(dev, dev->base_addr);
132 else { 131 else {
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 33afea31d87b..ecbddc80a2a5 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -143,7 +143,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
143 if (!dev) 143 if (!dev)
144 return -ENOMEM; 144 return -ENOMEM;
145 145
146 SET_MODULE_OWNER(dev);
147 if (dev->base_addr) /* probe specific location */ 146 if (dev->base_addr) /* probe specific location */
148 err = sk_isa_probe1(dev, dev->base_addr); 147 err = sk_isa_probe1(dev, dev->base_addr);
149 else { 148 else {
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index f83bb5cb0d3d..93da3a36cde8 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3583,8 +3583,6 @@ struct net_device __init *smctr_probe(int unit)
3583 if (!dev) 3583 if (!dev)
3584 return ERR_PTR(-ENOMEM); 3584 return ERR_PTR(-ENOMEM);
3585 3585
3586 SET_MODULE_OWNER(dev);
3587
3588 if (unit >= 0) { 3586 if (unit >= 0) {
3589 sprintf(dev->name, "tr%d", unit); 3587 sprintf(dev->name, "tr%d", unit);
3590 netdev_boot_setup_check(dev); 3588 netdev_boot_setup_check(dev);
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index aec75c930c21..ecdd8511a67b 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -115,7 +115,6 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
115 dev = alloc_trdev(sizeof(struct net_local)); 115 dev = alloc_trdev(sizeof(struct net_local));
116 if (!dev) 116 if (!dev)
117 return -ENOMEM; 117 return -ENOMEM;
118 SET_MODULE_OWNER(dev);
119 118
120 if (!request_region(pci_ioaddr, TMS_PCI_IO_EXTENT, dev->name)) { 119 if (!request_region(pci_ioaddr, TMS_PCI_IO_EXTENT, dev->name)) {
121 ret = -EBUSY; 120 ret = -EBUSY;
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index a1d305b9b12a..fe3225df0d32 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1607,7 +1607,6 @@ tsi108_init_one(struct platform_device *pdev)
1607 */ 1607 */
1608 1608
1609 dev->features = NETIF_F_HIGHDMA; 1609 dev->features = NETIF_F_HIGHDMA;
1610 SET_MODULE_OWNER(dev);
1611 1610
1612 spin_lock_init(&data->txlock); 1611 spin_lock_init(&data->txlock);
1613 spin_lock_init(&data->misclock); 1612 spin_lock_init(&data->misclock);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d380e0b3f05a..bd04e93908ef 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1944,7 +1944,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
1944 if (!dev) 1944 if (!dev)
1945 return -ENOMEM; 1945 return -ENOMEM;
1946 1946
1947 SET_MODULE_OWNER(dev);
1948 SET_NETDEV_DEV(dev, &pdev->dev); 1947 SET_NETDEV_DEV(dev, &pdev->dev);
1949 dev->open = de_open; 1948 dev->open = de_open;
1950 dev->stop = de_close; 1949 dev->stop = de_close;
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 09902891a6e6..ba7f47c2dcff 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1261,7 +1261,6 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
1261 } 1261 }
1262 1262
1263 /* The DE4X5-specific entries in the device structure. */ 1263 /* The DE4X5-specific entries in the device structure. */
1264 SET_MODULE_OWNER(dev);
1265 SET_NETDEV_DEV(dev, gendev); 1264 SET_NETDEV_DEV(dev, gendev);
1266 dev->open = &de4x5_open; 1265 dev->open = &de4x5_open;
1267 dev->hard_start_xmit = &de4x5_queue_pkt; 1266 dev->hard_start_xmit = &de4x5_queue_pkt;
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index dab74feb44bc..e2596e9ab1d7 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -372,7 +372,6 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
372 dev = alloc_etherdev(sizeof(*db)); 372 dev = alloc_etherdev(sizeof(*db));
373 if (dev == NULL) 373 if (dev == NULL)
374 return -ENOMEM; 374 return -ENOMEM;
375 SET_MODULE_OWNER(dev);
376 SET_NETDEV_DEV(dev, &pdev->dev); 375 SET_NETDEV_DEV(dev, &pdev->dev);
377 376
378 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 377 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7040a59fa3c9..66977aaa7176 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1345,7 +1345,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
1345 return -ENOMEM; 1345 return -ENOMEM;
1346 } 1346 }
1347 1347
1348 SET_MODULE_OWNER(dev);
1349 SET_NETDEV_DEV(dev, &pdev->dev); 1348 SET_NETDEV_DEV(dev, &pdev->dev);
1350 if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) { 1349 if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
1351 printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, " 1350 printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, "
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index e26ce44561c4..2b7257d97c32 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -268,7 +268,6 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
268 dev = alloc_etherdev(sizeof(*db)); 268 dev = alloc_etherdev(sizeof(*db));
269 if (dev == NULL) 269 if (dev == NULL)
270 return -ENOMEM; 270 return -ENOMEM;
271 SET_MODULE_OWNER(dev);
272 SET_NETDEV_DEV(dev, &pdev->dev); 271 SET_NETDEV_DEV(dev, &pdev->dev);
273 272
274 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 273 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 5824f6a35495..396f8455cd32 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -370,7 +370,6 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
370 dev = alloc_etherdev(sizeof(*np)); 370 dev = alloc_etherdev(sizeof(*np));
371 if (!dev) 371 if (!dev)
372 return -ENOMEM; 372 return -ENOMEM;
373 SET_MODULE_OWNER(dev);
374 SET_NETDEV_DEV(dev, &pdev->dev); 373 SET_NETDEV_DEV(dev, &pdev->dev);
375 374
376 if (pci_request_regions(pdev, DRV_NAME)) 375 if (pci_request_regions(pdev, DRV_NAME))
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 4b239dcbef74..de8c92083e92 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -252,7 +252,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
252 goto tx_buf_fail; 252 goto tx_buf_fail;
253 } 253 }
254 254
255 SET_MODULE_OWNER(dev);
256 SET_NETDEV_DEV(dev, &pdev->dev); 255 SET_NETDEV_DEV(dev, &pdev->dev);
257 256
258 257
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index fc439f333350..c3f8e303c6c7 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -547,7 +547,6 @@ static int __devinit xircom_init_one(struct pci_dev *pdev, const struct pci_devi
547 printk (KERN_ERR DRV_NAME "%d: cannot alloc etherdev, aborting\n", board_idx); 547 printk (KERN_ERR DRV_NAME "%d: cannot alloc etherdev, aborting\n", board_idx);
548 return -ENOMEM; 548 return -ENOMEM;
549 } 549 }
550 SET_MODULE_OWNER(dev);
551 SET_NETDEV_DEV(dev, &pdev->dev); 550 SET_NETDEV_DEV(dev, &pdev->dev);
552 551
553 dev->base_addr = ioaddr; 552 dev->base_addr = ioaddr;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 691d264fbb6f..8b3ec335385c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -435,7 +435,6 @@ static void tun_setup(struct net_device *dev)
435 tun->owner = -1; 435 tun->owner = -1;
436 tun->group = -1; 436 tun->group = -1;
437 437
438 SET_MODULE_OWNER(dev);
439 dev->open = tun_net_open; 438 dev->open = tun_net_open;
440 dev->hard_start_xmit = tun_net_xmit; 439 dev->hard_start_xmit = tun_net_xmit;
441 dev->stop = tun_net_close; 440 dev->stop = tun_net_close;
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 0377b8b64c78..84d99fc77891 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2332,7 +2332,6 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2332 err = -ENOMEM; 2332 err = -ENOMEM;
2333 goto error_out; 2333 goto error_out;
2334 } 2334 }
2335 SET_MODULE_OWNER(dev);
2336 SET_NETDEV_DEV(dev, &pdev->dev); 2335 SET_NETDEV_DEV(dev, &pdev->dev);
2337 2336
2338 err = pci_enable_device(pdev); 2337 err = pci_enable_device(pdev);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 72f617bf2520..8da41229594a 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3957,7 +3957,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
3957 /* Set the dev->base_addr to the gfar reg region */ 3957 /* Set the dev->base_addr to the gfar reg region */
3958 dev->base_addr = (unsigned long)(ug_info->uf_info.regs); 3958 dev->base_addr = (unsigned long)(ug_info->uf_info.regs);
3959 3959
3960 SET_MODULE_OWNER(dev);
3961 SET_NETDEV_DEV(dev, device); 3960 SET_NETDEV_DEV(dev, device);
3962 3961
3963 /* Fill in the dev structure */ 3962 /* Fill in the dev structure */
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 524dc5f5e46d..58a53a641754 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1152,8 +1152,6 @@ err_fw:
1152 1152
1153 INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl); 1153 INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
1154 1154
1155 SET_MODULE_OWNER(netdev);
1156
1157 usb_set_intfdata(intf, kaweth); 1155 usb_set_intfdata(intf, kaweth);
1158 1156
1159#if 0 1157#if 0
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 06838928ef47..432a2f054468 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1321,7 +1321,6 @@ static int pegasus_probe(struct usb_interface *intf,
1321 pegasus->intf = intf; 1321 pegasus->intf = intf;
1322 pegasus->usb = dev; 1322 pegasus->usb = dev;
1323 pegasus->net = net; 1323 pegasus->net = net;
1324 SET_MODULE_OWNER(net);
1325 net->open = pegasus_open; 1324 net->open = pegasus_open;
1326 net->stop = pegasus_close; 1325 net->stop = pegasus_close;
1327 net->watchdog_timeo = PEGASUS_TX_TIMEOUT; 1326 net->watchdog_timeo = PEGASUS_TX_TIMEOUT;
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 3b3a57ea2676..33cbc306226c 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -917,7 +917,6 @@ static int rtl8150_probe(struct usb_interface *intf,
917 917
918 dev->udev = udev; 918 dev->udev = udev;
919 dev->netdev = netdev; 919 dev->netdev = netdev;
920 SET_MODULE_OWNER(netdev);
921 netdev->open = rtl8150_open; 920 netdev->open = rtl8150_open;
922 netdev->stop = rtl8150_close; 921 netdev->stop = rtl8150_close;
923 netdev->do_ioctl = rtl8150_ioctl; 922 netdev->do_ioctl = rtl8150_ioctl;
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 3034d1aea376..3542ca5fb0fa 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1173,7 +1173,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
1173 init_timer (&dev->delay); 1173 init_timer (&dev->delay);
1174 mutex_init (&dev->phy_mutex); 1174 mutex_init (&dev->phy_mutex);
1175 1175
1176 SET_MODULE_OWNER (net);
1177 dev->net = net; 1176 dev->net = net;
1178 strcpy (net->name, "usb%d"); 1177 strcpy (net->name, "usb%d");
1179 memcpy (net->dev_addr, node_id, sizeof node_id); 1178 memcpy (net->dev_addr, node_id, sizeof node_id);
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 7a5899059c44..987f5b937e3c 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -702,7 +702,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
702 printk(KERN_ERR "alloc_etherdev failed\n"); 702 printk(KERN_ERR "alloc_etherdev failed\n");
703 goto err_out; 703 goto err_out;
704 } 704 }
705 SET_MODULE_OWNER(dev);
706 SET_NETDEV_DEV(dev, &pdev->dev); 705 SET_NETDEV_DEV(dev, &pdev->dev);
707 706
708 rp = netdev_priv(dev); 707 rp = netdev_priv(dev);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index a4729bc385f4..511a74c6e78b 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -712,7 +712,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
712 712
713 /* Chain it all together */ 713 /* Chain it all together */
714 714
715 SET_MODULE_OWNER(dev);
716 SET_NETDEV_DEV(dev, &pdev->dev); 715 SET_NETDEV_DEV(dev, &pdev->dev);
717 vptr = netdev_priv(dev); 716 vptr = netdev_priv(dev);
718 717
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 8ead774d14c8..c4c8eab8574f 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -363,7 +363,6 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
363 hdlc = dev_to_hdlc(dev); 363 hdlc = dev_to_hdlc(dev);
364 364
365 spin_lock_init(&card->lock); 365 spin_lock_init(&card->lock);
366 SET_MODULE_OWNER(dev);
367 dev->irq = irq; 366 dev->irq = irq;
368 dev->mem_start = winbase; 367 dev->mem_start = winbase;
369 dev->mem_end = winbase + C101_MAPPED_RAM_SIZE - 1; 368 dev->mem_end = winbase + C101_MAPPED_RAM_SIZE - 1;
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index a8af28b273d3..46e053106d4d 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -508,7 +508,6 @@ static int cycx_netdevice_init(struct net_device *dev)
508 508
509 /* Set transmit buffer queue length */ 509 /* Set transmit buffer queue length */
510 dev->tx_queue_len = 10; 510 dev->tx_queue_len = 10;
511 SET_MODULE_OWNER(dev);
512 511
513 /* Initialize socket buffers */ 512 /* Initialize socket buffers */
514 cycx_x25_set_chan_state(dev, WAN_DISCONNECTED); 513 cycx_x25_set_chan_state(dev, WAN_DISCONNECTED);
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 50d2f9108dca..33dc713b5301 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -925,7 +925,6 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
925 d->do_ioctl = dscc4_ioctl; 925 d->do_ioctl = dscc4_ioctl;
926 d->tx_timeout = dscc4_tx_timeout; 926 d->tx_timeout = dscc4_tx_timeout;
927 d->watchdog_timeo = TX_TIMEOUT; 927 d->watchdog_timeo = TX_TIMEOUT;
928 SET_MODULE_OWNER(d);
929 SET_NETDEV_DEV(d, &pdev->dev); 928 SET_NETDEV_DEV(d, &pdev->dev);
930 929
931 dpriv->dev_id = i; 930 dpriv->dev_id = i;
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index bf5f8d9b5c83..83dbc924fcb5 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -241,8 +241,6 @@ static struct sv11_device *sv11_init(int iobase, int irq)
241 if(!sv->netdev.dev) 241 if(!sv->netdev.dev)
242 goto fail2; 242 goto fail2;
243 243
244 SET_MODULE_OWNER(sv->netdev.dev);
245
246 dev=&sv->sync; 244 dev=&sv->sync;
247 245
248 /* 246 /*
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 699b93406dfb..36e683ccae5e 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -329,7 +329,6 @@ static void lapbeth_setup(struct net_device *dev)
329 dev->hard_header_len = 3; 329 dev->hard_header_len = 3;
330 dev->mtu = 1000; 330 dev->mtu = 1000;
331 dev->addr_len = 0; 331 dev->addr_len = 0;
332 SET_MODULE_OWNER(dev);
333} 332}
334 333
335/* 334/*
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index ae132c1c5459..5ea877221f46 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -883,7 +883,6 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
883 dev->base_addr = pci_resource_start(pdev, 0); 883 dev->base_addr = pci_resource_start(pdev, 0);
884 dev->irq = pdev->irq; 884 dev->irq = pdev->irq;
885 885
886 SET_MODULE_OWNER(dev);
887 SET_NETDEV_DEV(dev, &pdev->dev); 886 SET_NETDEV_DEV(dev, &pdev->dev);
888 887
889 /* 888 /*
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index cbdf0b748bde..0a566b0daacb 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -459,7 +459,6 @@ static int __init n2_run(unsigned long io, unsigned long irq,
459 port->log_node = 1; 459 port->log_node = 1;
460 460
461 spin_lock_init(&port->lock); 461 spin_lock_init(&port->lock);
462 SET_MODULE_OWNER(dev);
463 dev->irq = irq; 462 dev->irq = irq;
464 dev->mem_start = winbase; 463 dev->mem_start = winbase;
465 dev->mem_end = winbase + USE_WINDOWSIZE - 1; 464 dev->mem_end = winbase + USE_WINDOWSIZE - 1;
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 6353cb5c658d..bf1b01590429 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -468,7 +468,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
468 port->phy_node = i; 468 port->phy_node = i;
469 469
470 spin_lock_init(&port->lock); 470 spin_lock_init(&port->lock);
471 SET_MODULE_OWNER(dev);
472 dev->irq = card->irq; 471 dev->irq = card->irq;
473 dev->mem_start = ramphys; 472 dev->mem_start = ramphys;
474 dev->mem_end = ramphys + ramsize - 1; 473 dev->mem_end = ramphys + ramsize - 1;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 092e51d89036..b595b64e7538 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -415,7 +415,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
415 port->phy_node = i; 415 port->phy_node = i;
416 416
417 spin_lock_init(&port->lock); 417 spin_lock_init(&port->lock);
418 SET_MODULE_OWNER(dev);
419 dev->irq = card->irq; 418 dev->irq = card->irq;
420 dev->mem_start = ramphys; 419 dev->mem_start = ramphys;
421 dev->mem_end = ramphys + ramsize - 1; 420 dev->mem_end = ramphys + ramsize - 1;
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 8d7e01e8f56f..76db40d200d8 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -216,8 +216,6 @@ static void __init sbni_devsetup(struct net_device *dev)
216 dev->get_stats = &sbni_get_stats; 216 dev->get_stats = &sbni_get_stats;
217 dev->set_multicast_list = &set_multicast_list; 217 dev->set_multicast_list = &set_multicast_list;
218 dev->do_ioctl = &sbni_ioctl; 218 dev->do_ioctl = &sbni_ioctl;
219
220 SET_MODULE_OWNER( dev );
221} 219}
222 220
223int __init sbni_probe(int unit) 221int __init sbni_probe(int unit)
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 792e588d7d61..b39a541b2509 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1603,7 +1603,6 @@ static void setup_sdla(struct net_device *dev)
1603 1603
1604 netdev_boot_setup_check(dev); 1604 netdev_boot_setup_check(dev);
1605 1605
1606 SET_MODULE_OWNER(dev);
1607 dev->flags = 0; 1606 dev->flags = 0;
1608 dev->type = 0xFFFF; 1607 dev->type = 0xFFFF;
1609 dev->hard_header_len = 0; 1608 dev->hard_header_len = 0;
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 3c78f9856380..8e320b76ae0e 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -779,7 +779,6 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
779 port->dev = dev; 779 port->dev = dev;
780 hdlc = dev_to_hdlc(dev); 780 hdlc = dev_to_hdlc(dev);
781 spin_lock_init(&port->lock); 781 spin_lock_init(&port->lock);
782 SET_MODULE_OWNER(dev);
783 dev->tx_queue_len = 50; 782 dev->tx_queue_len = 50;
784 dev->do_ioctl = wanxl_ioctl; 783 dev->do_ioctl = wanxl_ioctl;
785 dev->open = wanxl_open; 784 dev->open = wanxl_open;
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index a0326818ff2f..cef365881ac2 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -93,8 +93,6 @@ static int __init do_wd_probe(struct net_device *dev)
93 int mem_start = dev->mem_start; 93 int mem_start = dev->mem_start;
94 int mem_end = dev->mem_end; 94 int mem_end = dev->mem_end;
95 95
96 SET_MODULE_OWNER(dev);
97
98 if (base_addr > 0x1ff) { /* Check a user specified location. */ 96 if (base_addr > 0x1ff) { /* Check a user specified location. */
99 r = request_region(base_addr, WD_IO_EXTENT, "wd-probe"); 97 r = request_region(base_addr, WD_IO_EXTENT, "wd-probe");
100 if ( r == NULL) 98 if ( r == NULL)
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index a152797b951a..80ae75999536 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2870,7 +2870,6 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
2870 dev->base_addr = port; 2870 dev->base_addr = port;
2871 2871
2872 SET_NETDEV_DEV(dev, dmdev); 2872 SET_NETDEV_DEV(dev, dmdev);
2873 SET_MODULE_OWNER(dev);
2874 2873
2875 reset_card (dev, 1); 2874 reset_card (dev, 1);
2876 msleep(400); 2875 msleep(400);
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c
index 7d5b8c2cc614..6f7eb9f59223 100644
--- a/drivers/net/wireless/airport.c
+++ b/drivers/net/wireless/airport.c
@@ -197,7 +197,6 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
197 return -EBUSY; 197 return -EBUSY;
198 } 198 }
199 199
200 SET_MODULE_OWNER(dev);
201 SET_NETDEV_DEV(dev, &mdev->ofdev.dev); 200 SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
202 201
203 macio_set_drvdata(mdev, dev); 202 macio_set_drvdata(mdev, dev);
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index 498e8486d125..3eaaab0ba0cc 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1792,8 +1792,6 @@ struct net_device * __init arlan_probe(int unit)
1792 if (!dev) 1792 if (!dev)
1793 return ERR_PTR(-ENOMEM); 1793 return ERR_PTR(-ENOMEM);
1794 1794
1795 SET_MODULE_OWNER(dev);
1796
1797 if (unit >= 0) { 1795 if (unit >= 0) {
1798 sprintf(dev->name, "eth%d", unit); 1796 sprintf(dev->name, "eth%d", unit);
1799 netdev_boot_setup_check(dev); 1797 netdev_boot_setup_check(dev);
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 51a7db53afa5..47dbdf95ea6f 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1603,7 +1603,6 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
1603 dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], 1603 dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
1604 dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] ); 1604 dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
1605 1605
1606 SET_MODULE_OWNER(dev);
1607 return dev; 1606 return dev;
1608 1607
1609err_out_res: 1608err_out_res:
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index dfbd01eaaf34..e038d072398d 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -4092,7 +4092,6 @@ static int __devinit bcm43xx_init_one(struct pci_dev *pdev,
4092 goto out; 4092 goto out;
4093 } 4093 }
4094 /* initialize the net_device struct */ 4094 /* initialize the net_device struct */
4095 SET_MODULE_OWNER(net_dev);
4096 SET_NETDEV_DEV(net_dev, &pdev->dev); 4095 SET_NETDEV_DEV(net_dev, &pdev->dev);
4097 4096
4098 net_dev->open = bcm43xx_net_open; 4097 net_dev->open = bcm43xx_net_open;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 8990585bd228..12a6887cb9f1 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6239,8 +6239,6 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
6239 6239
6240 IPW_DEBUG_INFO("Attempting to register device...\n"); 6240 IPW_DEBUG_INFO("Attempting to register device...\n");
6241 6241
6242 SET_MODULE_OWNER(dev);
6243
6244 printk(KERN_INFO DRV_NAME 6242 printk(KERN_INFO DRV_NAME
6245 ": Detected Intel PRO/Wireless 2100 Network Connection\n"); 6243 ": Detected Intel PRO/Wireless 2100 Network Connection\n");
6246 6244
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 61497c467467..afad8bb7e334 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -11625,7 +11625,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
11625 goto out_destroy_workqueue; 11625 goto out_destroy_workqueue;
11626 } 11626 }
11627 11627
11628 SET_MODULE_OWNER(net_dev);
11629 SET_NETDEV_DEV(net_dev, &pdev->dev); 11628 SET_NETDEV_DEV(net_dev, &pdev->dev);
11630 11629
11631 mutex_lock(&priv->mutex); 11630 mutex_lock(&priv->mutex);
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 3feddcc750ed..cb0359df355e 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1157,8 +1157,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
1157 priv->infra_open = 0; 1157 priv->infra_open = 0;
1158 priv->hotplug_device = dmdev; 1158 priv->hotplug_device = dmdev;
1159 1159
1160 SET_MODULE_OWNER(dev);
1161
1162 /* Setup the OS Interface to our functions */ 1160 /* Setup the OS Interface to our functions */
1163 dev->open = libertas_open; 1161 dev->open = libertas_open;
1164 dev->hard_start_xmit = libertas_pre_start_xmit; 1162 dev->hard_start_xmit = libertas_pre_start_xmit;
@@ -1340,8 +1338,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
1340 mesh_dev->priv = priv; 1338 mesh_dev->priv = priv;
1341 priv->mesh_dev = mesh_dev; 1339 priv->mesh_dev = mesh_dev;
1342 1340
1343 SET_MODULE_OWNER(mesh_dev);
1344
1345 mesh_dev->open = libertas_mesh_open; 1341 mesh_dev->open = libertas_mesh_open;
1346 mesh_dev->hard_start_xmit = libertas_mesh_pre_start_xmit; 1342 mesh_dev->hard_start_xmit = libertas_mesh_pre_start_xmit;
1347 mesh_dev->stop = libertas_mesh_close; 1343 mesh_dev->stop = libertas_mesh_close;
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 45b00e13ab2b..389fdd313c7e 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -412,7 +412,6 @@ static int netwave_probe(struct pcmcia_device *link)
412 spin_lock_init(&priv->spinlock); 412 spin_lock_init(&priv->spinlock);
413 413
414 /* Netwave specific entries in the device structure */ 414 /* Netwave specific entries in the device structure */
415 SET_MODULE_OWNER(dev);
416 dev->hard_start_xmit = &netwave_start_xmit; 415 dev->hard_start_xmit = &netwave_start_xmit;
417 dev->get_stats = &netwave_get_stats; 416 dev->get_stats = &netwave_get_stats;
418 dev->set_multicast_list = &set_multicast_list; 417 dev->set_multicast_list = &set_multicast_list;
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index d1e502236b2a..8b7f5768a103 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -313,7 +313,6 @@ orinoco_cs_config(struct pcmcia_device *link)
313 /* Ok, we have the configuration, prepare to register the netdev */ 313 /* Ok, we have the configuration, prepare to register the netdev */
314 dev->base_addr = link->io.BasePort1; 314 dev->base_addr = link->io.BasePort1;
315 dev->irq = link->irq.AssignedIRQ; 315 dev->irq = link->irq.AssignedIRQ;
316 SET_MODULE_OWNER(dev);
317 card->node.major = card->node.minor = 0; 316 card->node.major = card->node.minor = 0;
318 317
319 SET_NETDEV_DEV(dev, &handle_to_dev(link)); 318 SET_NETDEV_DEV(dev, &handle_to_dev(link));
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index eaf3d13b851c..35ec5fcf81a6 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -193,7 +193,6 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
193 card = priv->card; 193 card = priv->card;
194 card->bridge_io = bridge_io; 194 card->bridge_io = bridge_io;
195 card->attr_io = attr_io; 195 card->attr_io = attr_io;
196 SET_MODULE_OWNER(dev);
197 SET_NETDEV_DEV(dev, &pdev->dev); 196 SET_NETDEV_DEV(dev, &pdev->dev);
198 197
199 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING); 198 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 97a8b4ff32bd..2547d5dac0d3 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -148,7 +148,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
148 148
149 priv = netdev_priv(dev); 149 priv = netdev_priv(dev);
150 card = priv->card; 150 card = priv->card;
151 SET_MODULE_OWNER(dev);
152 SET_NETDEV_DEV(dev, &pdev->dev); 151 SET_NETDEV_DEV(dev, &pdev->dev);
153 152
154 hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING); 153 hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c
index 31162ac25a92..98fe165337d1 100644
--- a/drivers/net/wireless/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco_plx.c
@@ -232,7 +232,6 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
232 card = priv->card; 232 card = priv->card;
233 card->bridge_io = bridge_io; 233 card->bridge_io = bridge_io;
234 card->attr_io = attr_io; 234 card->attr_io = attr_io;
235 SET_MODULE_OWNER(dev);
236 SET_NETDEV_DEV(dev, &pdev->dev); 235 SET_NETDEV_DEV(dev, &pdev->dev);
237 236
238 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING); 237 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c
index b9c54d8fceb9..df493185a4af 100644
--- a/drivers/net/wireless/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco_tmd.c
@@ -134,7 +134,6 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
134 priv = netdev_priv(dev); 134 priv = netdev_priv(dev);
135 card = priv->card; 135 card = priv->card;
136 card->bridge_io = bridge_io; 136 card->bridge_io = bridge_io;
137 SET_MODULE_OWNER(dev);
138 SET_NETDEV_DEV(dev, &pdev->dev); 137 SET_NETDEV_DEV(dev, &pdev->dev);
139 138
140 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING); 139 hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 084795355b74..219dd651dc41 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -808,7 +808,6 @@ islpci_setup(struct pci_dev *pdev)
808 if (!ndev) 808 if (!ndev)
809 return ndev; 809 return ndev;
810 810
811 SET_MODULE_OWNER(ndev);
812 pci_set_drvdata(pdev, ndev); 811 pci_set_drvdata(pdev, ndev);
813#if defined(SET_NETDEV_DEV) 812#if defined(SET_NETDEV_DEV)
814 SET_NETDEV_DEV(ndev, &pdev->dev); 813 SET_NETDEV_DEV(ndev, &pdev->dev);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1d9dbf830015..1b0e9707049a 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -356,7 +356,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
356 dev->set_multicast_list = &set_multicast_list; 356 dev->set_multicast_list = &set_multicast_list;
357 357
358 DEBUG(2,"ray_cs ray_attach calling ether_setup.)\n"); 358 DEBUG(2,"ray_cs ray_attach calling ether_setup.)\n");
359 SET_MODULE_OWNER(dev);
360 dev->init = &ray_dev_init; 359 dev->init = &ray_dev_init;
361 dev->open = &ray_open; 360 dev->open = &ray_open;
362 dev->stop = &ray_dev_close; 361 dev->stop = &ray_dev_close;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index af70460f008a..98df9bc7836a 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -782,7 +782,6 @@ spectrum_cs_config(struct pcmcia_device *link)
782 /* Ok, we have the configuration, prepare to register the netdev */ 782 /* Ok, we have the configuration, prepare to register the netdev */
783 dev->base_addr = link->io.BasePort1; 783 dev->base_addr = link->io.BasePort1;
784 dev->irq = link->irq.AssignedIRQ; 784 dev->irq = link->irq.AssignedIRQ;
785 SET_MODULE_OWNER(dev);
786 card->node.major = card->node.minor = 0; 785 card->node.major = card->node.minor = 0;
787 786
788 /* Reset card and download firmware */ 787 /* Reset card and download firmware */
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index c49d5a1f94a2..404cd1512312 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -2508,8 +2508,6 @@ static void strip_dev_setup(struct net_device *dev)
2508 * Finish setting up the DEVICE info. 2508 * Finish setting up the DEVICE info.
2509 */ 2509 */
2510 2510
2511 SET_MODULE_OWNER(dev);
2512
2513 dev->trans_start = 0; 2511 dev->trans_start = 0;
2514 dev->last_rx = 0; 2512 dev->last_rx = 0;
2515 dev->tx_queue_len = 30; /* Drop after 30 frames queued */ 2513 dev->tx_queue_len = 30; /* Drop after 30 frames queued */
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 1cf090d60edc..b876bf65935b 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -4177,7 +4177,6 @@ static int __init wavelan_config(struct net_device *dev, unsigned short ioaddr)
4177 /* Init spinlock */ 4177 /* Init spinlock */
4178 spin_lock_init(&lp->spinlock); 4178 spin_lock_init(&lp->spinlock);
4179 4179
4180 SET_MODULE_OWNER(dev);
4181 dev->open = wavelan_open; 4180 dev->open = wavelan_open;
4182 dev->stop = wavelan_close; 4181 dev->stop = wavelan_close;
4183 dev->hard_start_xmit = wavelan_packet_xmit; 4182 dev->hard_start_xmit = wavelan_packet_xmit;
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 5740d4d4267c..1cc5180ab1e7 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -4577,7 +4577,6 @@ wavelan_probe(struct pcmcia_device *p_dev)
4577 lp->dev = dev; 4577 lp->dev = dev;
4578 4578
4579 /* wavelan NET3 callbacks */ 4579 /* wavelan NET3 callbacks */
4580 SET_MODULE_OWNER(dev);
4581 dev->open = &wavelan_open; 4580 dev->open = &wavelan_open;
4582 dev->stop = &wavelan_close; 4581 dev->stop = &wavelan_close;
4583 dev->hard_start_xmit = &wavelan_packet_xmit; 4582 dev->hard_start_xmit = &wavelan_packet_xmit;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 732b59f19892..cfde68cff94c 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -2003,8 +2003,6 @@ static int wl3501_config(struct pcmcia_device *link)
2003 goto failed; 2003 goto failed;
2004 } 2004 }
2005 2005
2006 SET_MODULE_OWNER(dev);
2007
2008 this = netdev_priv(dev); 2006 this = netdev_priv(dev);
2009 /* 2007 /*
2010 * At this point, the dev_node_t structure(s) should be initialized and 2008 * At this point, the dev_node_t structure(s) should be initialized and
diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.c b/drivers/net/wireless/zd1211rw/zd_netdev.c
index 8bda48de31ef..047cab3d87df 100644
--- a/drivers/net/wireless/zd1211rw/zd_netdev.c
+++ b/drivers/net/wireless/zd1211rw/zd_netdev.c
@@ -233,7 +233,6 @@ struct net_device *zd_netdev_alloc(struct usb_interface *intf)
233 return NULL; 233 return NULL;
234 } 234 }
235 235
236 SET_MODULE_OWNER(netdev);
237 SET_NETDEV_DEV(netdev, &intf->dev); 236 SET_NETDEV_DEV(netdev, &intf->dev);
238 237
239 dev_dbg_f(&intf->dev, "netdev->flags %#06hx\n", netdev->flags); 238 dev_dbg_f(&intf->dev, "netdev->flags %#06hx\n", netdev->flags);
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index b4de126825e4..8eeb068dc4a6 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1176,7 +1176,6 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev
1176 netdev->features = NETIF_F_IP_CSUM; 1176 netdev->features = NETIF_F_IP_CSUM;
1177 1177
1178 SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops); 1178 SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops);
1179 SET_MODULE_OWNER(netdev);
1180 SET_NETDEV_DEV(netdev, &dev->dev); 1179 SET_NETDEV_DEV(netdev, &dev->dev);
1181 1180
1182 np->netdev = netdev; 1181 np->netdev = netdev;
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 870c5393c21a..29e96950be65 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -392,7 +392,6 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
392 printk (KERN_ERR PFX "cannot allocate ethernet device\n"); 392 printk (KERN_ERR PFX "cannot allocate ethernet device\n");
393 return -ENOMEM; 393 return -ENOMEM;
394 } 394 }
395 SET_MODULE_OWNER(dev);
396 SET_NETDEV_DEV(dev, &pdev->dev); 395 SET_NETDEV_DEV(dev, &pdev->dev);
397 396
398 np = netdev_priv(dev); 397 np = netdev_priv(dev);
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 4032e9f6f9b0..dcd4e1b136b5 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -388,8 +388,6 @@ static int __init znet_probe (void)
388 if (!dev) 388 if (!dev)
389 return -ENOMEM; 389 return -ENOMEM;
390 390
391 SET_MODULE_OWNER (dev);
392
393 znet = dev->priv; 391 znet = dev->priv;
394 392
395 netinfo = (struct netidblk *)p; 393 netinfo = (struct netidblk *)p;
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index d85e2ea0b6af..a45f9952a3f7 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -125,7 +125,6 @@ static int __devinit zorro8390_init_one(struct zorro_dev *z,
125 dev = ____alloc_ei_netdev(0); 125 dev = ____alloc_ei_netdev(0);
126 if (!dev) 126 if (!dev)
127 return -ENOMEM; 127 return -ENOMEM;
128 SET_MODULE_OWNER(dev);
129 if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) { 128 if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
130 free_netdev(dev); 129 free_netdev(dev);
131 return -EBUSY; 130 return -EBUSY;