patch-2.4.0-prerelease linux/drivers/net/mace.c

Next file: linux/drivers/net/ncr885e.c
Previous file: linux/drivers/net/mac89x0.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/net/mace.c linux/drivers/net/mace.c
@@ -133,9 +133,11 @@
 	}
 
 	dev = init_etherdev(0, PRIV_BYTES);
-	memset(dev->priv, 0, PRIV_BYTES);
+	if (!dev)
+		return;
+	SET_MODULE_OWNER(dev);
 
-	mp = (struct mace_data *) dev->priv;
+	mp = dev->priv;
 	dev->base_addr = mace->addrs[0].address;
 	mp->mace = (volatile struct mace *)
 		ioremap(mace->addrs[0].address, 0x1000);
@@ -353,7 +355,6 @@
     /* enable all interrupts except receive interrupts */
     out_8(&mb->imr, RCVINT);
 
-    MOD_INC_USE_COUNT;
     return 0;
 }
 
@@ -391,8 +392,6 @@
     st_le32(&td->control, (RUN|PAUSE|FLUSH|WAKE) << 16); /* clear run bit */
 
     mace_clean_rings(mp);
-
-    MOD_DEC_USE_COUNT;
 
     return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)