From 10d024c1b2fd58af8362670d7d6e5ae52fc33353 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 17 Sep 2007 13:11:17 -0700
Subject: [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>
---
 drivers/net/3c501.c                         | 2 --
 drivers/net/3c503.c                         | 2 --
 drivers/net/3c505.c                         | 2 --
 drivers/net/3c507.c                         | 2 --
 drivers/net/3c509.c                         | 6 ------
 drivers/net/3c515.c                         | 2 --
 drivers/net/3c523.c                         | 1 -
 drivers/net/3c527.c                         | 2 --
 drivers/net/3c59x.c                         | 1 -
 drivers/net/8139cp.c                        | 1 -
 drivers/net/8139too.c                       | 1 -
 drivers/net/82596.c                         | 1 -
 drivers/net/a2065.c                         | 1 -
 drivers/net/ac3200.c                        | 2 --
 drivers/net/acenic.c                        | 1 -
 drivers/net/amd8111e.c                      | 1 -
 drivers/net/apne.c                          | 1 -
 drivers/net/appletalk/cops.c                | 2 --
 drivers/net/appletalk/ipddp.c               | 1 -
 drivers/net/appletalk/ltpc.c                | 2 --
 drivers/net/arcnet/com90io.c                | 2 --
 drivers/net/ariadne.c                       | 1 -
 drivers/net/arm/at91_ether.c                | 1 -
 drivers/net/arm/ether1.c                    | 1 -
 drivers/net/arm/ether3.c                    | 1 -
 drivers/net/arm/etherh.c                    | 1 -
 drivers/net/at1700.c                        | 2 --
 drivers/net/atarilance.c                    | 1 -
 drivers/net/atl1/atl1_main.c                | 1 -
 drivers/net/atp.c                           | 1 -
 drivers/net/b44.c                           | 1 -
 drivers/net/bfin_mac.c                      | 1 -
 drivers/net/bmac.c                          | 1 -
 drivers/net/bnx2.c                          | 1 -
 drivers/net/bonding/bond_main.c             | 2 --
 drivers/net/cassini.c                       | 1 -
 drivers/net/chelsio/cxgb2.c                 | 1 -
 drivers/net/cs89x0.c                        | 1 -
 drivers/net/cxgb3/cxgb3_main.c              | 1 -
 drivers/net/de600.c                         | 1 -
 drivers/net/de620.c                         | 2 --
 drivers/net/defxx.c                         | 1 -
 drivers/net/dgrs.c                          | 2 --
 drivers/net/dl2k.c                          | 1 -
 drivers/net/dm9000.c                        | 1 -
 drivers/net/dummy.c                         | 1 -
 drivers/net/e100.c                          | 1 -
 drivers/net/e1000/e1000_main.c              | 1 -
 drivers/net/e1000e/netdev.c                 | 1 -
 drivers/net/e2100.c                         | 2 --
 drivers/net/eepro.c                         | 4 ----
 drivers/net/eepro100.c                      | 1 -
 drivers/net/eexpress.c                      | 2 --
 drivers/net/ehea/ehea_main.c                | 2 --
 drivers/net/epic100.c                       | 1 -
 drivers/net/eql.c                           | 2 --
 drivers/net/es3210.c                        | 2 --
 drivers/net/eth16i.c                        | 2 --
 drivers/net/ewrk3.c                         | 1 -
 drivers/net/fealnx.c                        | 1 -
 drivers/net/fec_8xx/fec_main.c              | 1 -
 drivers/net/forcedeth.c                     | 1 -
 drivers/net/fs_enet/fs_enet-main.c          | 1 -
 drivers/net/gianfar.c                       | 1 -
 drivers/net/hamachi.c                       | 1 -
 drivers/net/hamradio/6pack.c                | 2 --
 drivers/net/hp-plus.c                       | 2 --
 drivers/net/hp.c                            | 2 --
 drivers/net/hp100.c                         | 5 -----
 drivers/net/hydra.c                         | 1 -
 drivers/net/ibm_emac/ibm_emac_core.c        | 1 -
 drivers/net/ibmlana.c                       | 2 --
 drivers/net/ibmveth.c                       | 4 ----
 drivers/net/ifb.c                           | 1 -
 drivers/net/ioc3-eth.c                      | 1 -
 drivers/net/irda/ali-ircc.c                 | 4 ----
 drivers/net/irda/donauboe.c                 | 1 -
 drivers/net/irda/irda-usb.c                 | 1 -
 drivers/net/irda/irport.c                   | 2 --
 drivers/net/irda/kingsun-sir.c              | 1 -
 drivers/net/irda/ks959-sir.c                | 1 -
 drivers/net/irda/ksdazzle-sir.c             | 1 -
 drivers/net/irda/mcs7780.c                  | 2 --
 drivers/net/irda/nsc-ircc.c                 | 1 -
 drivers/net/irda/sir_dev.c                  | 2 --
 drivers/net/irda/smsc-ircc2.c               | 2 --
 drivers/net/irda/stir4200.c                 | 1 -
 drivers/net/irda/via-ircc.c                 | 3 ---
 drivers/net/irda/vlsi_ir.c                  | 2 --
 drivers/net/irda/w83977af_ir.c              | 3 ---
 drivers/net/isa-skeleton.c                  | 2 --
 drivers/net/ixgb/ixgb_main.c                | 1 -
 drivers/net/ixgbe/ixgbe_main.c              | 1 -
 drivers/net/ixp2000/enp2611.c               | 1 -
 drivers/net/jazzsonic.c                     | 1 -
 drivers/net/lance.c                         | 1 -
 drivers/net/lguest_net.c                    | 2 --
 drivers/net/lne390.c                        | 2 --
 drivers/net/mac8390.c                       | 2 --
 drivers/net/mac89x0.c                       | 2 --
 drivers/net/macb.c                          | 1 -
 drivers/net/mace.c                          | 1 -
 drivers/net/macmace.c                       | 1 -
 drivers/net/macsonic.c                      | 1 -
 drivers/net/mv643xx_eth.c                   | 1 -
 drivers/net/mvme147.c                       | 2 --
 drivers/net/myri_sbus.c                     | 1 -
 drivers/net/natsemi.c                       | 1 -
 drivers/net/ne-h8300.c                      | 2 --
 drivers/net/ne.c                            | 2 --
 drivers/net/ne2.c                           | 2 --
 drivers/net/ne2k-pci.c                      | 1 -
 drivers/net/ne3210.c                        | 1 -
 drivers/net/netx-eth.c                      | 1 -
 drivers/net/netxen/netxen_nic_main.c        | 1 -
 drivers/net/ni5010.c                        | 2 --
 drivers/net/ni52.c                          | 2 --
 drivers/net/ni65.c                          | 1 -
 drivers/net/ns83820.c                       | 1 -
 drivers/net/pasemi_mac.c                    | 1 -
 drivers/net/pci-skeleton.c                  | 1 -
 drivers/net/pcmcia/3c589_cs.c               | 1 -
 drivers/net/pcmcia/axnet_cs.c               | 3 ---
 drivers/net/pcmcia/fmvj18x_cs.c             | 1 -
 drivers/net/pcmcia/nmclan_cs.c              | 1 -
 drivers/net/pcmcia/pcnet_cs.c               | 1 -
 drivers/net/pcmcia/smc91c92_cs.c            | 1 -
 drivers/net/pcmcia/xirc2ps_cs.c             | 1 -
 drivers/net/pcnet32.c                       | 1 -
 drivers/net/plip.c                          | 1 -
 drivers/net/ps3_gelic_net.c                 | 1 -
 drivers/net/qla3xxx.c                       | 1 -
 drivers/net/r8169.c                         | 1 -
 drivers/net/rionet.c                        | 2 --
 drivers/net/rrunner.c                       | 1 -
 drivers/net/s2io.c                          | 1 -
 drivers/net/sb1000.c                        | 1 -
 drivers/net/shaper.c                        | 2 --
 drivers/net/sis190.c                        | 1 -
 drivers/net/sis900.c                        | 1 -
 drivers/net/sk98lin/skge.c                  | 1 -
 drivers/net/skfp/skfddi.c                   | 1 -
 drivers/net/skge.c                          | 1 -
 drivers/net/sky2.c                          | 1 -
 drivers/net/slip.c                          | 2 --
 drivers/net/smc-mca.c                       | 1 -
 drivers/net/smc-ultra.c                     | 2 --
 drivers/net/smc-ultra32.c                   | 2 --
 drivers/net/smc911x.c                       | 1 -
 drivers/net/smc9194.c                       | 2 --
 drivers/net/smc91x.c                        | 1 -
 drivers/net/spider_net.c                    | 1 -
 drivers/net/starfire.c                      | 1 -
 drivers/net/stnic.c                         | 1 -
 drivers/net/sun3_82586.c                    | 1 -
 drivers/net/sun3lance.c                     | 1 -
 drivers/net/sunbmac.c                       | 1 -
 drivers/net/sundance.c                      | 1 -
 drivers/net/sungem.c                        | 1 -
 drivers/net/sunhme.c                        | 2 --
 drivers/net/sunlance.c                      | 1 -
 drivers/net/sunqe.c                         | 1 -
 drivers/net/tc35815.c                       | 1 -
 drivers/net/tg3.c                           | 1 -
 drivers/net/tlan.c                          | 1 -
 drivers/net/tokenring/3c359.c               | 1 -
 drivers/net/tokenring/abyss.c               | 2 --
 drivers/net/tokenring/lanstreamer.c         | 1 -
 drivers/net/tokenring/madgemc.c             | 1 -
 drivers/net/tokenring/olympic.c             | 1 -
 drivers/net/tokenring/proteon.c             | 1 -
 drivers/net/tokenring/skisa.c               | 1 -
 drivers/net/tokenring/smctr.c               | 2 --
 drivers/net/tokenring/tmspci.c              | 1 -
 drivers/net/tsi108_eth.c                    | 1 -
 drivers/net/tulip/de2104x.c                 | 1 -
 drivers/net/tulip/de4x5.c                   | 1 -
 drivers/net/tulip/dmfe.c                    | 1 -
 drivers/net/tulip/tulip_core.c              | 1 -
 drivers/net/tulip/uli526x.c                 | 1 -
 drivers/net/tulip/winbond-840.c             | 1 -
 drivers/net/tulip/xircom_cb.c               | 1 -
 drivers/net/tulip/xircom_tulip_cb.c         | 1 -
 drivers/net/tun.c                           | 1 -
 drivers/net/typhoon.c                       | 1 -
 drivers/net/ucc_geth.c                      | 1 -
 drivers/net/usb/kaweth.c                    | 2 --
 drivers/net/usb/pegasus.c                   | 1 -
 drivers/net/usb/rtl8150.c                   | 1 -
 drivers/net/usb/usbnet.c                    | 1 -
 drivers/net/via-rhine.c                     | 1 -
 drivers/net/via-velocity.c                  | 1 -
 drivers/net/wan/c101.c                      | 1 -
 drivers/net/wan/cycx_x25.c                  | 1 -
 drivers/net/wan/dscc4.c                     | 1 -
 drivers/net/wan/hostess_sv11.c              | 2 --
 drivers/net/wan/lapbether.c                 | 1 -
 drivers/net/wan/lmc/lmc_main.c              | 1 -
 drivers/net/wan/n2.c                        | 1 -
 drivers/net/wan/pc300too.c                  | 1 -
 drivers/net/wan/pci200syn.c                 | 1 -
 drivers/net/wan/sbni.c                      | 2 --
 drivers/net/wan/sdla.c                      | 1 -
 drivers/net/wan/wanxl.c                     | 1 -
 drivers/net/wd.c                            | 2 --
 drivers/net/wireless/airo.c                 | 1 -
 drivers/net/wireless/airport.c              | 1 -
 drivers/net/wireless/arlan-main.c           | 2 --
 drivers/net/wireless/atmel.c                | 1 -
 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 1 -
 drivers/net/wireless/ipw2100.c              | 2 --
 drivers/net/wireless/ipw2200.c              | 1 -
 drivers/net/wireless/libertas/main.c        | 4 ----
 drivers/net/wireless/netwave_cs.c           | 1 -
 drivers/net/wireless/orinoco_cs.c           | 1 -
 drivers/net/wireless/orinoco_nortel.c       | 1 -
 drivers/net/wireless/orinoco_pci.c          | 1 -
 drivers/net/wireless/orinoco_plx.c          | 1 -
 drivers/net/wireless/orinoco_tmd.c          | 1 -
 drivers/net/wireless/prism54/islpci_dev.c   | 1 -
 drivers/net/wireless/ray_cs.c               | 1 -
 drivers/net/wireless/spectrum_cs.c          | 1 -
 drivers/net/wireless/strip.c                | 2 --
 drivers/net/wireless/wavelan.c              | 1 -
 drivers/net/wireless/wavelan_cs.c           | 1 -
 drivers/net/wireless/wl3501_cs.c            | 2 --
 drivers/net/wireless/zd1211rw/zd_netdev.c   | 1 -
 drivers/net/xen-netfront.c                  | 1 -
 drivers/net/yellowfin.c                     | 1 -
 drivers/net/znet.c                          | 2 --
 drivers/net/zorro8390.c                     | 1 -
 231 files changed, 316 deletions(-)

(limited to 'drivers/net')

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 4bee99ba7db..98e0bc4628a 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -174,8 +174,6 @@ struct net_device * __init el1_probe(int unit)
 		mem_start = dev->mem_start & 7;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (io > 0x1ff) {	/* Check a single specified location. */
 		err = el1_probe1(dev, io);
 	} else if (io != 0) {
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index bc7e906571d..f9e7ffbcb77 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)
     int base_addr = dev->base_addr;
     int irq = dev->irq;
 
-    SET_MODULE_OWNER(dev);
-
     if (base_addr > 0x1ff)	/* Check a single specified location. */
 	return el2_probe1(dev, base_addr);
     else if (base_addr != 0)		/* Don't probe at all. */
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index acede307c05..c05bb3fc57a 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1387,8 +1387,6 @@ static int __init elplus_setup(struct net_device *dev)
 	unsigned long cookie = 0;
 	int err = -ENODEV;
 
-	SET_MODULE_OWNER(dev);
-
 	/*
 	 *  setup adapter structure
 	 */
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index eed4299dc42..fac6edff2b8 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -327,8 +327,6 @@ struct net_device * __init el16_probe(int unit)
 		mem_start = dev->mem_start & 15;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (io > 0x1ff) 	/* Check a single specified location. */
 		err = el16_probe1(dev, io);
 	else if (io != 0)
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 127f60841b1..7466987d845 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -432,7 +432,6 @@ __again:
 					return -ENOMEM;
 			}
 
-			SET_MODULE_OWNER(dev);
 			SET_NETDEV_DEV(dev, &idev->dev);
 			pnp_cards++;
 
@@ -524,8 +523,6 @@ no_pnp:
 	if (!dev)
 		return -ENOMEM;
 
-	SET_MODULE_OWNER(dev);
-
 	netdev_boot_setup_check(dev);
 
 	/* Set passed-in IRQ or I/O Addr. */
@@ -644,7 +641,6 @@ static int __init el3_mca_probe(struct device *device)
 			return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
 	netdev_boot_setup_check(dev);
 
 	memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
@@ -704,8 +700,6 @@ static int __init el3_eisa_probe (struct device *device)
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	netdev_boot_setup_check(dev);
 
 	memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 290166d5e7d..38a2ebea9b4 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -501,8 +501,6 @@ static struct net_device *corkscrew_scan(int unit)
 		netdev_boot_setup_check(dev);
 	}
 
-	SET_MODULE_OWNER(dev);
-
 #ifdef __ISAPNP__
 	if(nopnp == 1)
 		goto no_pnp;
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index ab18343e58e..10852b2a40a 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)
 	int retval;
 	struct priv *pr = dev->priv;
 
-	SET_MODULE_OWNER(dev);
 	if (MCA_bus == 0) {
 		return -ENODEV;
 	}
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index c7b571be20e..5b5f44cdfc1 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -257,8 +257,6 @@ struct net_device *__init mc32_probe(int unit)
 	if (unit >= 0)
 		sprintf(dev->name, "eth%d", unit);
 
-	SET_MODULE_OWNER(dev);
-
 	/* Do not check any supplied i/o locations.
 	   POS registers usually don't fail :) */
 
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 29e558913eb..ad0f6a729d2 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1036,7 +1036,6 @@ static int __devinit vortex_probe1(struct device *gendev,
 		printk (KERN_ERR PFX "unable to allocate etherdev, aborting\n");
 		goto out;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, gendev);
 	vp = netdev_priv(dev);
 
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 2dec3d6ae01..30310ed9f75 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)
 	dev = alloc_etherdev(sizeof(struct cp_private));
 	if (!dev)
 		return -ENOMEM;
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	cp = netdev_priv(dev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 7ba470ee217..28c1aaf1fe1 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,
 		dev_err(&pdev->dev, "Unable to alloc new net device\n");
 		return -ENOMEM;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	tp = netdev_priv(dev);
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index d915837193c..43dffdca708 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1234,7 +1234,6 @@ struct net_device * __init i82596_probe(int unit)
 	DEB(DEB_PROBE,printk(KERN_INFO "%s", version));
 
 	/* The 82596-specific entries in the device structure. */
-	SET_MODULE_OWNER(dev);
 	dev->open = i596_open;
 	dev->stop = i596_close;
 	dev->hard_start_xmit = i596_start_xmit;
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index a45de6975bf..fa0c6cb3d79 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,
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
 	priv = netdev_priv(dev);
 
 	r1->name = dev->name;
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 644c408515d..65b2de56ed2 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)
 	int irq = dev->irq;
 	int mem_start = dev->mem_start;
 
-	SET_MODULE_OWNER(dev);
-
 	if (ioaddr > 0x1ff)		/* Check a single specified location. */
 		return ac_probe1(ioaddr, dev);
 	else if (ioaddr > 0)		/* Don't probe at all. */
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 62e660a7938..ca00f41e4d8 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,
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	ap = dev->priv;
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index cf06fc067e9..afb60a5927a 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,
 		goto err_free_reg;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 #if AMD8111E_VLAN_TAG_USED
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 954191119d3..b073810f9fd 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -148,7 +148,6 @@ struct net_device * __init apne_probe(int unit)
 		sprintf(dev->name, "eth%d", unit);
 		netdev_boot_setup_check(dev);
 	}
-	SET_MODULE_OWNER(dev);
 
 	/* disable pcmcia irq for readtuple */
 	pcmcia_disable_irq();
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index da6ffa8cd81..c4b560d42a6 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)
 		base_addr = dev->base_addr = io;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (base_addr > 0x1ff) {    /* Check a single specified location. */
 		err = cops_probe1(dev, base_addr);
 	} 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 f22e46dfd77..56cb9679402 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)
 	if (!dev)
 		return ERR_PTR(-ENOMEM);
 
-	SET_MODULE_OWNER(dev);
 	strcpy(dev->name, "ipddp%d");
 
 	if (version_printed++ == 0)
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6a6cbd331a1..cb4744e5690 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1046,8 +1046,6 @@ struct net_device * __init ltpc_probe(void)
 	if (!dev)
 		goto out;
 
-	SET_MODULE_OWNER(dev);
-
 	/* probe for the I/O port address */
 	
 	if (io != 0x240 && request_region(0x220,8,"ltpc")) {
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 1f030273541..6599f1046c7 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -398,8 +398,6 @@ static int __init com90io_init(void)
 	if (!dev)
 		return -ENOMEM;
 
-	SET_MODULE_OWNER(dev);
-
 	dev->base_addr = io;
 	dev->irq = irq;
 	if (dev->irq == 2)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index bc5a38a6705..2c020a36177 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,
 	return -ENOMEM;
     }
 
-    SET_MODULE_OWNER(dev);
     priv = netdev_priv(dev);
 
     r1->name = dev->name;
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index ef2cc80256a..619810a01e5 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
 
 	dev->base_addr = AT91_VA_BASE_EMAC;
 	dev->irq = AT91RM9200_ID_EMAC;
-	SET_MODULE_OWNER(dev);
 
 	/* Install the interrupt handler */
 	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 80f33b6d571..6ec8a587c1d 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)
 		goto release;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &ec->dev);
 
 	dev->irq = ec->irq;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 3805506a3ab..4a914748c0e 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)
 		goto release;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &ec->dev);
 
 	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 0d37d9d1fd7..5d093b3ddcd 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)
 		goto release;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &ec->dev);
 
 	dev->open		= etherh_open;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index bed8e0ebaf1..d20148e69fa 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -225,8 +225,6 @@ struct net_device * __init at1700_probe(int unit)
 		dev->irq = irq;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (io > 0x1ff) {	/* Check a single specified location. */
 		err = at1700_probe1(dev, io);
 	} else if (io != 0) {	/* Don't probe at all. */
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index dfa8b9ba4c8..97cca505cf9 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -390,7 +390,6 @@ struct net_device * __init atarilance_probe(int unit)
 		sprintf(dev->name, "eth%d", unit);
 		netdev_boot_setup_check(dev);
 	}
-	SET_MODULE_OWNER(dev);
 
 	for( i = 0; i < N_LANCE_ADDR; ++i ) {
 		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 469ff95be55..e1a9223d0c1 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,
 		err = -ENOMEM;
 		goto err_alloc_etherdev;
 	}
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 82d78ff8399..6020d5ec38b 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -299,7 +299,6 @@ static int __init atp_probe1(long ioaddr)
 	dev = alloc_etherdev(sizeof(struct net_local));
 	if (!dev)
 		return -ENOMEM;
-	SET_MODULE_OWNER(dev);
 
 	/* Find the IRQ used by triggering an interrupt. */
 	write_reg_byte(ioaddr, CMR2, 0x01);			/* No accept mode, IRQ out. */
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index b92b3e25c42..6d193705a3b 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,
 		goto err_out_free_res;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev,&pdev->dev);
 
 	/* No interesting netdevice features in this card... */
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 3354c534335..e5bbcbe8de5 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)
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(ndev);
 	SET_NETDEV_DEV(ndev, &pdev->dev);
 
 	platform_set_drvdata(pdev, ndev);
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 1eb95b60300..ee157f5a5db 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
 	}
 
 	bp = netdev_priv(dev);
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
 	macio_set_drvdata(mdev, dev);
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ab028ad0423..61debba873a 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)
 	u32 reg;
 	u64 dma_mask, persist_dma_mask;
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	bp = netdev_priv(dev);
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 559fe9437e0..88ff72ac9b0 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
 		goto out_netdev;
 	}
 
-	SET_MODULE_OWNER(bond_dev);
-
 	res = register_netdevice(bond_dev);
 	if (res < 0) {
 		goto out_bond;
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 13f14df21e6..f44f3d2a4b4 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,
 		err = -ENOMEM;
 		goto err_out_disable_pdev;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	err = pci_request_regions(pdev, dev->name);
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 593736c7550..884aa0cd000 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,
 			goto out_free_dev;
 		}
 
-		SET_MODULE_OWNER(netdev);
 		SET_NETDEV_DEV(netdev, &pdev->dev);
 
 		if (!adapter) {
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 9774bb1b3e8..2b4c9219391 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)
 	int eeprom_buff[CHKSUM_LEN];
 	int retval;
 
-	SET_MODULE_OWNER(dev);
 	/* Initialize the device structure. */
 	if (!modular) {
 		memset(lp, 0, sizeof(*lp));
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index a6723ae79bd..19937498589 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,
 			goto out_free_dev;
 		}
 
-		SET_MODULE_OWNER(netdev);
 		SET_NETDEV_DEV(netdev, &pdev->dev);
 
 		adapter->port[i] = netdev;
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index dae97b860da..5dd0d9c0eac 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -394,7 +394,6 @@ static struct net_device * __init de600_probe(void)
 	if (!dev)
 		return ERR_PTR(-ENOMEM);
 
-	SET_MODULE_OWNER(dev);
 
 	if (!request_region(DE600_IO, 3, "de600")) {
 		printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO);
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index dc489242617..a92c207b883 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -823,8 +823,6 @@ struct net_device * __init de620_probe(int unit)
 	if (!dev)
 		goto out;
 
-	SET_MODULE_OWNER(dev);
-
 	spin_lock_init(&de620_lock);
 
 	/*
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 9c8e3f9f5e5..b07613e61f5 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -539,7 +539,6 @@ static int __devinit dfx_register(struct device *bdev)
 		goto err_out;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, bdev);
 
 	bp = netdev_priv(dev);
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index df62c0232f3..ddedb76303d 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1272,7 +1272,6 @@ dgrs_found_device(
 	priv->chan = 1;
 	priv->devtbl[0] = dev;
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, pdev);
 
 	ret = dgrs_probe1(dev);
@@ -1320,7 +1319,6 @@ dgrs_found_device(
 		if (ret)
 			goto fail;
 
-		SET_MODULE_OWNER(devN);
 		SET_NETDEV_DEV(dev, pdev);
 
 		ret = register_netdev(devN);
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index ca21a1888ff..12486e13b85 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)
 		err = -ENOMEM;
 		goto err_out_res;
 	}
-	SET_MODULE_OWNER (dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 #ifdef MEM_MAPPING
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 738aa590651..857eb366bb1 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -416,7 +416,6 @@ dm9000_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(ndev);
 	SET_NETDEV_DEV(ndev, &pdev->dev);
 
 	PRINTK2("dm9000_probe()");
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 756a6bcb038..84e14f397d9 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -71,7 +71,6 @@ static void dummy_setup(struct net_device *dev)
 	dev->change_mtu = NULL;
 	dev->flags |= IFF_NOARP;
 	dev->flags &= ~IFF_MULTICAST;
-	SET_MODULE_OWNER(dev);
 	random_ether_addr(dev->dev_addr);
 }
 
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 10907f158ba..f9aa13e04ad 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2604,7 +2604,6 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 		goto err_out_free_res;
 	}
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	if (use_io)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 723568d6e44..7befb706ad5 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,
 	if (!netdev)
 		goto err_alloc_etherdev;
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index eeb40ccbcb2..885d9467f40 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,
 	if (!netdev)
 		goto err_alloc_etherdev;
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index b2b0a96218c..6390f51ea6f 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)
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-	SET_MODULE_OWNER(dev);
-
 	if (base_addr > 0x1ff)		/* Check a single specified location. */
 		return e21_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 47680237f78..6eb84f14c88 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)
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-	SET_MODULE_OWNER(dev);
-
 #ifdef PnPWakeup
 	/* XXXX for multiple cards should this only be run once? */
 
@@ -594,8 +592,6 @@ struct net_device * __init eepro_probe(int unit)
 	if (!dev)
 		return ERR_PTR(-ENODEV);
 
-	SET_MODULE_OWNER(dev);
-
 	sprintf(dev->name, "eth%d", unit);
 	netdev_boot_setup_check(dev);
 
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 3c54014acec..f8b69ceb2be 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -635,7 +635,6 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
 		return -1;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	if (dev->mem_start > 0)
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 7934ea37f94..6c91bfa72bb 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)
 	int dev_irq = dev->irq;
 	int err;
 
-	SET_MODULE_OWNER(dev);
-
 	dev->if_port = 0xff; /* not set */
 
 #ifdef CONFIG_MCA_LEGACY
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index b8e00391a5e..62d6c1e5f9d 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,
 	SET_NETDEV_DEV(dev, port_dev);
 
 	/* initialize net_device structure */
-	SET_MODULE_OWNER(dev);
-
 	memcpy(dev->dev_addr, &port->mac_addr, ETH_ALEN);
 
 	dev->open = ehea_open;
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index f8446e373bd..122ffd2f082 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,
 		dev_err(&pdev->dev, "no memory for eth device\n");
 		goto err_out_free_res;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 #ifdef USE_IO_OPS
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index f1cc66dcbdf..7266f6dbdd9 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -167,8 +167,6 @@ static void __init eql_setup(struct net_device *dev)
 {
 	equalizer_t *eql = netdev_priv(dev);
 
-	SET_MODULE_OWNER(dev);
-
 	init_timer(&eql->timer);
 	eql->timer.data     	= (unsigned long) eql;
 	eql->timer.expires  	= jiffies + EQL_DEFAULT_RESCHED_IVAL;
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 822e5bfd1a7..238fa8aff02 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)
 	int irq = dev->irq;
 	int mem_start = dev->mem_start;
 
-	SET_MODULE_OWNER(dev);
-
 	if (ioaddr > 0x1ff)		/* Check a single specified location. */
 		return es_probe1(dev, ioaddr);
 	else if (ioaddr > 0)		/* Don't probe at all. */
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 04abf59e500..0e3b33717ca 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)
 	int ioaddr;
 	int base_addr = dev->base_addr;
 
-	SET_MODULE_OWNER(dev);
-
 	if(eth16i_debug > 4)
 		printk(KERN_DEBUG "Probing started for %s\n", cardname);
 
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index cb0792c187b..6a5d0436e89 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -356,7 +356,6 @@ struct net_device * __init ewrk3_probe(int unit)
 		sprintf(dev->name, "eth%d", unit);
 		netdev_boot_setup_check(dev);
 	}
-	SET_MODULE_OWNER(dev);
 
 	err = ewrk3_probe1(dev, dev->base_addr, dev->irq);
 	if (err)
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index ff9f177d715..e9353072a96 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,
 		err = -ENOMEM;
 		goto err_out_unmap;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	/* read ethernet id */
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 6348fb93ca9..6f214ab12ff 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,
 		err = -ENOMEM;
 		goto err;
 	}
-	SET_MODULE_OWNER(dev);
 
 	fep = netdev_priv(dev);
 	fep->dev = dev;
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 24c1294614f..050a8f14eda 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
 	np->dev = dev;
 	np->pci_dev = pci_dev;
 	spin_lock_init(&np->lock);
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pci_dev->dev);
 
 	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 2812b524eda..f6789a8db8c 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,
 		err = -ENOMEM;
 		goto err;
 	}
-	SET_MODULE_OWNER(ndev);
 
 	fep = netdev_priv(ndev);
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index bd2de325bbd..002f8baaab2 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -254,7 +254,6 @@ static int gfar_probe(struct platform_device *pdev)
 	/* Set the dev->base_addr to the gfar reg region */
 	dev->base_addr = (unsigned long) (priv->regs);
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	/* Fill in the dev structure */
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 15254dc7876..da12b3db023 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,
 	if (!dev)
 		goto err_out_iounmap;
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 #ifdef TX_CHECKSUM
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 760d04a671f..0a847326a5e 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)
 	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
 	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
 
-	SET_MODULE_OWNER(dev);
-
 	dev->flags		= 0;
 }
 
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 99a36cc3f8d..8d4f810fa28 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)
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-	SET_MODULE_OWNER(dev);
-
 	if (base_addr > 0x1ff)		/* Check a single specified location. */
 		return hpp_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 635b13c2e2a..1f11126de35 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)
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-	SET_MODULE_OWNER(dev);
-
 	if (base_addr > 0x1ff)		/* Check a single specified location. */
 		return hp_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 8caa591c564..406d6525e22 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -404,8 +404,6 @@ struct net_device * __init hp100_probe(int unit)
 	if (!dev)
 		return ERR_PTR(-ENODEV);
 
-	SET_MODULE_OWNER(dev);
-
 #ifdef HP100_DEBUG_B
 	hp100_outw(0x4200, TRACE);
 	printk("hp100: %s: probe\n", dev->name);
@@ -2843,7 +2841,6 @@ static int __init hp100_eisa_probe (struct device *gendev)
 	if (!dev)
 		return -ENOMEM;
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &edev->dev);
 
 	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,
 		goto out0;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
@@ -2993,7 +2989,6 @@ static int __init hp100_isa_init(void)
 
 			return -ENOMEM;
 		}
-		SET_MODULE_OWNER(dev);
 
 		err = hp100_isa_probe(dev, hp100_port[i]);
 		if (!err)
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index f970bfbb9db..31300a9dd96 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -112,7 +112,6 @@ static int __devinit hydra_init(struct zorro_dev *z)
     dev = ____alloc_ei_netdev(0);
     if (!dev)
 	return -ENOMEM;
-    SET_MODULE_OWNER(dev);
 
     for(j = 0; j < ETHER_ADDR_LEN; j++)
 	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 f752e5fc65b..354616b0b57 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)
 	dev->ndev = ndev;
 	dev->ldev = &ocpdev->dev;
 	dev->def = ocpdev->def;
-	SET_MODULE_OWNER(ndev);
 
 	/* Find MAL device we are connected to */
 	maldev =
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index fe85d6fcba3..67d82fa7659 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -907,8 +907,6 @@ static int ibmlana_probe(struct net_device *dev)
 	ibmlana_priv *priv;
 	ibmlana_medium medium;
 
-	SET_MODULE_OWNER(dev);
-
 	/* can't work without an MCA bus ;-) */
 	if (MCA_bus == 0)
 		return -ENODEV;
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 2dff9f2800c..db908c40dbe 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_
 	if(!netdev)
 		return -ENOMEM;
 
-	SET_MODULE_OWNER(netdev);
-
 	adapter = netdev->priv;
 	dev->dev.driver_data = netdev;
 
@@ -1258,7 +1256,6 @@ static void ibmveth_proc_register_driver(void)
 {
 	ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net);
 	if (ibmveth_proc_dir) {
-		SET_MODULE_OWNER(ibmveth_proc_dir);
 	}
 }
 
@@ -1356,7 +1353,6 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
 		} else {
 			entry->data = (void *) adapter;
 			entry->proc_fops = &ibmveth_proc_fops;
-			SET_MODULE_OWNER(entry);
 		}
 	}
 	return;
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index b06c6db4383..448e618b697 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -152,7 +152,6 @@ static void ifb_setup(struct net_device *dev)
 	dev->change_mtu = NULL;
 	dev->flags |= IFF_NOARP;
 	dev->flags &= ~IFF_MULTICAST;
-	SET_MODULE_OWNER(dev);
 	random_ether_addr(dev->dev_addr);
 }
 
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index c030030e586..05d2bc15144 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)
 	if (err)
 		goto out_free;
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	ip = netdev_priv(dev);
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index f9c889c0dd0..9f584521304 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)
 	self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0;
 	self->tx_fifo.tail = self->tx_buff.head;
 
-	
-	/* Keep track of module usage */
-	SET_MODULE_OWNER(dev);
-
 	/* Override the network functions we need to use */
 	dev->hard_start_xmit = ali_ircc_sir_hard_xmit;
 	dev->open            = ali_ircc_net_open;
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 3ca47bf6dfe..3e5eca1aa98 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)
       }
 #endif
 
-  SET_MODULE_OWNER(dev);
   SET_NETDEV_DEV(dev, &pci_dev->dev);
   dev->hard_start_xmit = toshoboe_hard_xmit;
   dev->open = toshoboe_net_open;
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 3b0fd83fa26..c6355c00fd7 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,
 	if (!net) 
 		goto err_out;
 
-	SET_MODULE_OWNER(net);
 	SET_NETDEV_DEV(net, &intf->dev);
 	self = net->priv;
 	self->netdev = net;
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 20732458f5a..c79caa5d3d7 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)
 	self->tx_buff.data = self->tx_buff.head;
 
 	self->netdev = dev;
-	/* Keep track of module usage */
-	SET_MODULE_OWNER(dev);
 
 	/* May be overridden by piggyback drivers */
 	self->interrupt    = irport_interrupt;
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index a4adb74cccd..648e54b3f00 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,
 	if(!net)
 		goto err_out1;
 
-	SET_MODULE_OWNER(net);
 	SET_NETDEV_DEV(net, &intf->dev);
 	kingsun = netdev_priv(net);
 	kingsun->irlap = NULL;
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 407afba1a59..8c257a51341 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,
 	if (!net)
 		goto err_out1;
 
-	SET_MODULE_OWNER(net);
 	SET_NETDEV_DEV(net, &intf->dev);
 	kingsun = netdev_priv(net);
 	kingsun->netdev = net;
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 12b0e7a15be..af60f2435a3 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,
 	if (!net)
 		goto err_out1;
 
-	SET_MODULE_OWNER(net);
 	SET_NETDEV_DEV(net, &intf->dev);
 	kingsun = netdev_priv(net);
 	kingsun->netdev = net;
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index bfc57525bd6..808939b9f8f 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,
 
 	IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum);
 
-	/* what is it realy for? */
-	SET_MODULE_OWNER(ndev);
 	SET_NETDEV_DEV(ndev, &intf->dev);
 
 	ret = usb_reset_configuration(udev);
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index d96c89751a7..12b9378c587 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)
 	self->tx_fifo.tail = self->tx_buff.head;
 
 	/* Override the network functions we need to use */
-	SET_MODULE_OWNER(dev);
 	dev->hard_start_xmit = nsc_ircc_hard_xmit_sir;
 	dev->open            = nsc_ircc_net_open;
 	dev->stop            = nsc_ircc_net_close;
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 9d6c8f391b2..bbe4e094c42 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
 	dev->drv = drv;
 	dev->netdev = ndev;
 
-	SET_MODULE_OWNER(ndev);
-
 	/* Override the network functions we need to use */
 	ndev->hard_start_xmit = sirdev_hard_xmit;
 	ndev->open = sirdev_open;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 36ab98386be..029fdde2a4d 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
 		goto err_out1;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
 #if SMSC_IRCC2_C_NET_TIMEOUT
 	dev->tx_timeout	     = smsc_ircc_timeout;
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 755aa444a4d..1afaee0fa7e 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,
 	if(!net)
 		goto err_out1;
 
-	SET_MODULE_OWNER(net);
 	SET_NETDEV_DEV(net, &intf->dev);
 	stir = netdev_priv(net);
 	stir->netdev = net;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index ff5358574d0..126ec7c8680 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)
 	self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0;
 	self->tx_fifo.tail = self->tx_buff.head;
 
-	/* Keep track of module usage */
-	SET_MODULE_OWNER(dev);
-
 	/* Override the network functions we need to use */
 	dev->hard_start_xmit = via_ircc_hard_xmit_sir;
 	dev->open = via_ircc_net_open;
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 0538ca9ce05..acd082a96a4 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)
 	vlsi_irda_dev_t *idev = ndev->priv;
 	struct pci_dev *pdev = idev->pdev;
 
-	SET_MODULE_OWNER(ndev);
-
 	ndev->irq = pdev->irq;
 	ndev->base_addr = pci_resource_start(pdev,0);
 
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 5182e800cc1..9fd2451b0fb 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,
 	self->rx_buff.data = self->rx_buff.head;
 	self->netdev = dev;
 
-	/* Keep track of module usage */
-	SET_MODULE_OWNER(dev);
-
 	/* Override the network functions we need to use */
 	dev->hard_start_xmit = w83977af_hard_xmit;
 	dev->open            = w83977af_net_open;
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 0343f12d2ff..54178111eec 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)
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-	SET_MODULE_OWNER(dev);
-
 	if (base_addr > 0x1ff)    /* Check a single specified location. */
 		return netcard_probe1(dev, base_addr);
 	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 e3f27c67fb2..d444de58ba3 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,
 		goto err_alloc_etherdev;
 	}
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index a08a46224c2..b75f1c6efc4 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,
 		goto err_alloc_etherdev;
 	}
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	pci_set_drvdata(pdev, netdev);
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index d3f4235c585..b02a981c87a 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -210,7 +210,6 @@ static int __init enp2611_init_module(void)
 			return -ENOMEM;
 		}
 
-		SET_MODULE_OWNER(nds[i]);
 		nds[i]->get_stats = enp2611_get_stats;
 		pm3386_init_port(i);
 		pm3386_get_mac(i, nds[i]->dev_addr);
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index b71e6633f42..13847a3e43e 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)
 	lp = netdev_priv(dev);
 	lp->device = &pdev->dev;
 	SET_NETDEV_DEV(dev, &pdev->dev);
- 	SET_MODULE_OWNER(dev);
 
 	netdev_boot_setup_check(dev);
 
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index a4e5fab1262..7b17212d687 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
 
 	/* We can't allocate dev->priv from alloc_etherdev() because it must
 	   a ISA DMA-able region. */
-	SET_MODULE_OWNER(dev);
 	chipname = chip_table[lance_version].name;
 	printk("%s: %s at %#3x,", dev->name, chipname, ioaddr);
 
diff --git a/drivers/net/lguest_net.c b/drivers/net/lguest_net.c
index cab57911a80..7f34c92bcd8 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)
 	if (!dev)
 		return -ENOMEM;
 
-	SET_MODULE_OWNER(dev);
-
 	/* Ethernet defaults with some changes */
 	ether_setup(dev);
 	dev->set_mac_address = NULL;
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 0a08d0c4e7b..2dd39698321 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)
 	int mem_start = dev->mem_start;
 	int ret;
 
-	SET_MODULE_OWNER(dev);
-
 	if (ioaddr > 0x1ff) {		/* Check a single specified location. */
 		if (!request_region(ioaddr, LNE390_IO_EXTENT, DRV_NAME))
 			return -EBUSY;
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 90b0c3ed4bb..9e700749bb3 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -313,8 +313,6 @@ struct net_device * __init mac8390_probe(int unit)
 	if (unit >= 0)
 		sprintf(dev->name, "eth%d", unit);
 
- 	SET_MODULE_OWNER(dev);
-
 	while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, NUBUS_TYPE_ETHERNET, ndev))) {
 		/* Have we seen it already? */
 		if (slots & (1<<ndev->board->slot))
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 62c1c6262fe..f6f3fdfe41d 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -191,8 +191,6 @@ struct net_device * __init mac89x0_probe(int unit)
 		netdev_boot_setup_check(dev);
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (once_is_enough)
 		goto out;
 	once_is_enough = 1;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 74c3f7a7ae4..c6707580c30 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1085,7 +1085,6 @@ static int __devinit macb_probe(struct platform_device *pdev)
 		goto err_out;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	/* TODO: Actually, we have some interesting features... */
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 52b9332810c..de3b002e9a4 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
 		rc = -ENOMEM;
 		goto err_release;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
 
 	mp = dev->priv;
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 9a343b96597..5d2daa24887 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -210,7 +210,6 @@ static int __devinit mace_probe(struct platform_device *pdev)
 
 	mp->device = &pdev->dev;
 	SET_NETDEV_DEV(dev, &pdev->dev);
- 	SET_MODULE_OWNER(dev);
 
 	dev->base_addr = (u32)MACE_BASE;
 	mp->mace = (volatile struct mace *) MACE_BASE;
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index e9ecdbf352a..a55a8399344 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)
 	lp = netdev_priv(dev);
 	lp->device = &pdev->dev;
 	SET_NETDEV_DEV(dev, &pdev->dev);
- 	SET_MODULE_OWNER(dev);
 
 	/* This will catch fatal stuff like -ENOMEM as well as success */
 	err = mac_onboard_sonic_probe(dev);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 702eba54916..6317bba9587 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)
 	mv643xx_eth_update_pscr(dev, &cmd);
 	mv643xx_set_settings(dev, &cmd);
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	err = register_netdev(dev);
 	if (err)
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index e246d00bba6..837ad0f2b05 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -79,8 +79,6 @@ struct net_device * __init mvme147lance_probe(int unit)
 	if (unit >= 0)
 		sprintf(dev->name, "eth%d", unit);
 
-	SET_MODULE_OWNER(dev);
-
 	/* Fill the dev fields */
 	dev->base_addr = (unsigned long)MVME147_LANCE_BASE;
 	dev->open = &m147lance_open;
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 13444da9327..331b76c4956 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)
 	if (version_printed++ == 0)
 		printk(version);
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
 
 	mp = (struct myri_eth *) dev->priv;
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 43cfa4b3e29..5ee4e8795d2 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -837,7 +837,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
 	dev = alloc_etherdev(sizeof (struct netdev_private));
 	if (!dev)
 		return -ENOMEM;
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	i = pci_request_regions(pdev, DRV_NAME);
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index 38fd525f0f1..a0f35361fbe 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)
 {
 	unsigned int base_addr = dev->base_addr;
 
-	SET_MODULE_OWNER(dev);
-
 	/* First check any supplied i/o locations. User knows best. <cough> */
 	if (base_addr > 0x1ff)	/* Check a single specified location. */
 		return ne_probe1(dev, base_addr);
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index c9f74bf5f49..c81befc3a7a 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)
 	int orig_irq = dev->irq;
 #endif
 
-	SET_MODULE_OWNER(dev);
-
 	/* First check any supplied i/o locations. User knows best. <cough> */
 	if (base_addr > 0x1ff)	/* Check a single specified location. */
 		return ne_probe1(dev, base_addr);
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 089b5bb702f..d1a4b8d7122 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)
 	int i;
 	int adapter_found = 0;
 
-	SET_MODULE_OWNER(dev);
-
 	/* Do not check any supplied i/o locations.
 	   POS registers usually don't fail :) */
 
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index f81d9398d60..230a0f1e03f 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,
 		dev_err(&pdev->dev, "cannot allocate ethernet device\n");
 		goto err_out_free_res;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	/* 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 1a6fed76d4c..b1bf8331e87 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -106,7 +106,6 @@ static int __init ne3210_eisa_probe (struct device *device)
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, device);
 	device->driver_data = dev;
 	ioaddr = edev->base_addr;
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index 2b8da0a5499..6fee405d840 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)
 		ret = -ENOMEM;
 		goto exit;
 	}
-	SET_MODULE_OWNER(ndev);
 	SET_NETDEV_DEV(ndev, &pdev->dev);
 
 	platform_set_drvdata(pdev, ndev);
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index dcd66a6b490..1b165a8c74f 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)
 		goto err_out_free_res;
 	}
 
-	SET_MODULE_OWNER(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
 	adapter = netdev->priv;
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 22a3b3dc7d8..cc1d09a21c0 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -135,8 +135,6 @@ struct net_device * __init ni5010_probe(int unit)
 
 	PRINTK2((KERN_DEBUG "%s: Entering ni5010_probe\n", dev->name));
 
-	SET_MODULE_OWNER(dev);
-
 	if (io > 0x1ff)	{	/* Check a single specified location. */
 		err = ni5010_probe1(dev, io);
 	} else if (io != 0) {	/* Don't probe at all. */
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 5e7999db209..6b3384a24f0 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -382,8 +382,6 @@ struct net_device * __init ni52_probe(int unit)
 		memend = dev->mem_end;
 	}
 
-	SET_MODULE_OWNER(dev);
-
 	if (io > 0x1ff)	{	/* Check a single specified location. */
 		err = ni52_probe1(dev, io);
 	} else if (io > 0) {		/* Don't probe at all. */
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 4ef5fe34519..09768524511 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)
 	}
 
 	dev->base_addr = ioaddr;
-	SET_MODULE_OWNER(dev);
 	dev->open		= ni65_open;
 	dev->stop		= ni65_close;
 	dev->hard_start_xmit	= ni65_send_packet;
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 6e65d61a3fe..de495b69729 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_
 	spin_lock_init(&dev->misc_lock);
 	dev->pci_dev = pci_dev;
 
-	SET_MODULE_OWNER(ndev);
 	SET_NETDEV_DEV(ndev, &pci_dev->dev);
 
 	INIT_WORK(&dev->tq_refill, queue_refill);
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 48c117038fe..723685ee57a 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)
 		goto out_disable_device;
 	}
 
-	SET_MODULE_OWNER(dev);
 	pci_set_drvdata(pdev, dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 3cdbe118200..a4b16484a5f 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,
 		DPRINTK ("EXIT, returning -ENOMEM\n");
 		return -ENOMEM;
 	}
-	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	tp = dev->priv;
 
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 503f2685fb7..2136c80c058 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)
     link->conf.ConfigIndex = 1;
 
     /* The EL3-specific entries in the device structure. */
-    SET_MODULE_OWNER(dev);
     dev->hard_start_xmit = &el3_start_xmit;
     dev->set_config = &el3_config;
     dev->get_stats = &el3_get_stats;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 50dff1b81d3..a9db59d2a2f 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)
 	if (ei_debug > 1)
 		printk(version_8390);
     
-	SET_MODULE_OWNER(dev);
-
-		
 	ei_local = (struct ei_device *)netdev_priv(dev);
 	spin_lock_init(&ei_local->page_lock);
     
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 85d5f2ca4bb..7f29e95a064 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)
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     /* The FMVJ18x specific entries in the device structure. */
-    SET_MODULE_OWNER(dev);
     dev->hard_start_xmit = &fjn_start_xmit;
     dev->set_config = &fjn_config;
     dev->get_stats = &fjn_get_stats;
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 997c2d0c83b..1bb2ffa294d 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -474,7 +474,6 @@ s