Skip to contentSkip to conversation

cli/sti cleanup in drivers/net/cris/eth_v10.c

PATCH Surya Prabhakar N 1 participant 1 message Aug 13, 2007 Network drivers

lore
Share & tools
lore
#0 lore raw

Hi,
Removed the cli/sti reference in eth_v10.c and updated it with
proper spinlock code.

---

drivers/net/cris/eth_v10.c +3 -4
index 5bdf5ca..d1f7225 100644
@@ -642,6 +642,7 @@ e100_set_mac_address(struct net_device *dev, void *p)
 static int
 e100_open(struct net_device *dev)
 {
+	struct net_local *np = (struct net_local *)dev->priv;
 	unsigned long flags;
 
 	/* enable the MDIO output pin */
@@ -723,9 +724,7 @@ e100_open(struct net_device *dev)
 	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, crc, enable);
 	*R_NETWORK_TR_CTRL = network_tr_ctrl_shadow;
 
-	save_flags(flags);
-	cli();
-
+	spin_lock_irqsave(&np->lock, flags);
 	/* enable the irq's for ethernet DMA */
 
 	*R_IRQ_MASK2_SET =
@@ -757,7 +756,7 @@ e100_open(struct net_device *dev)
 	*R_DMA_CH0_FIRST = 0;
 	*R_DMA_CH0_DESCR = virt_to_phys(myLastTxDesc);
 
-	restore_flags(flags);
+	spin_unlock_irqrestore(&np->lock, flags);
 
 	/* Probe for transceiver */
 	if (e100_probe_transceiver(dev))

--
thanks
surya.