Remove some uses of depreciated save_flags_cli() in favour of the more

generic local_irq_save() where appropriate.  (None of these are ever
going to be used on a SMP ARM machine).

arch/arm/mach-sa1100/leds-adsbitsy.c

@@ -28,7 +28,7 @@ void adsbitsy_leds_event(led_event_t evt)
 {
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 
 	switch (evt) {
 	case led_start:
@@ -92,5 +92,5 @@ void adsbitsy_leds_event(led_event_t evt)
 		GPCR = hw_led_state ^ LED_MASK;
 	}
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 }

arch/arm/mach-sa1100/leds-graphicsclient.c

@@ -30,7 +30,7 @@ void graphicsclient_leds_event(led_event_t evt)
 {
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 
 	switch (evt) {
 	case led_start:
@@ -100,5 +100,5 @@ void graphicsclient_leds_event(led_event_t evt)
 		GPCR = hw_led_state ^ LED_MASK;
 	}
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 }

arch/arm/mach-sa1100/leds-graphicsmaster.c

@@ -30,7 +30,7 @@ void graphicsmaster_leds_event(led_event_t evt)
 {
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 
 	switch (evt) {
 	case led_start:
@@ -100,5 +100,5 @@ void graphicsmaster_leds_event(led_event_t evt)
 		GPCR = hw_led_state ^ LED_MASK;
 	}
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 }

drivers/acorn/block/mfmhd.c

@@ -321,14 +321,14 @@ static void console_printf(const char *fmt,...)
 	unsigned long flags;
 	va_list ap;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 
 	va_start(ap, fmt);
 	vsprintf(buffer, fmt, ap);
 	console_print(buffer);
 	va_end(fmt);
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 };	/* console_printf */
 
 #define DBG(x...) console_printf(x)
@@ -1451,13 +1451,13 @@ static int mfm_reread_partitions(kdev_t dev)
 	unsigned int start, i, maxp, target = DEVICE_NR(MINOR(dev));
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 	if (mfm_info[target].busy || mfm_info[target].access_count > 1) {
-		restore_flags (flags);
+		local_irq_restore (flags);
 		return -EBUSY;
 	}
 	mfm_info[target].busy = 1;
-	restore_flags (flags);
+	local_irq_restore (flags);
 
 	maxp = 1 << mfm_gendisk.minor_shift;
 	start = target << mfm_gendisk.minor_shift;

drivers/acorn/net/ether1.c

@@ -99,13 +99,13 @@ ether1_inw_p (struct net_device *dev, int addr, int svflgs)
 	unsigned long flags;
 	unsigned short ret;
 
-	if (svflgs) {
-		save_flags_cli (flags);
-	}
+	if (svflgs)
+		local_irq_save (flags);
+
 	outb (addr >> 12, REG_PAGE);
 	ret = inw (ETHER1_RAM + ((addr & 4095) >> 1));
 	if (svflgs)
-		restore_flags (flags);
+		local_irq_restore (flags);
 	return ret;
 }
 
@@ -114,13 +114,13 @@ ether1_outw_p (struct net_device *dev, unsigned short val, int addr, int svflgs)
 {
 	unsigned long flags;
 
-	if (svflgs) {
-		save_flags_cli (flags);
-	}
+	if (svflgs)
+		local_irq_save (flags);
+
 	outb (addr >> 12, REG_PAGE);
 	outw (val, ETHER1_RAM + ((addr & 4095) >> 1));
 	if (svflgs)
-		restore_flags (flags);
+		local_irq_restore (flags);
 }
 
 /*
@@ -722,7 +722,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
 	nop.nop_command = CMD_NOP;
 	nop.nop_link = nopaddr;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 	ether1_writebuffer (dev, &tx, txaddr, TX_SIZE);
 	ether1_writebuffer (dev, &tbd, tbdaddr, TBD_SIZE);
 	ether1_writebuffer (dev, skb->data, dataddr, len);
@@ -733,7 +733,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
 	/* now reset the previous nop pointer */
 	ether1_outw (dev, txaddr, tmp, nop_t, nop_link, NORMALIRQS);
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 
 	/* handle transmit */
 	dev->trans_start = jiffies;

drivers/acorn/net/ether3.c

@@ -491,7 +491,7 @@ ether3_timeout(struct net_device *dev)
 
 	del_timer(&priv->timer);
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 	printk(KERN_ERR "%s: transmit timed out, network cable problem?\n", dev->name);
 	printk(KERN_ERR "%s: state: { status=%04X cfg1=%04X cfg2=%04X }\n", dev->name,
 		ether3_inw(REG_STATUS), ether3_inw(REG_CONFIG1), ether3_inw(REG_CONFIG2));
@@ -501,7 +501,7 @@ ether3_timeout(struct net_device *dev)
 		priv->tx_head, priv->tx_tail);
 	ether3_setbuffer(dev, buffer_read, priv->tx_tail);
 	printk(KERN_ERR "%s: packet status = %08X\n", dev->name, ether3_readlong(dev));
-	restore_flags(flags);
+	local_irq_restore(flags);
 
 	priv->regs.config2 |= CFG2_CTRLO;
 	priv->stats.tx_errors += 1;
@@ -533,10 +533,10 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
 
 	next_ptr = (priv->tx_head + 1) & 15;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 
 	if (priv->tx_tail == next_ptr) {
-		restore_flags(flags);
+		local_irq_restore(flags);
 		return 1;	/* unable to queue */
 	}
 
@@ -565,7 +565,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
 	}
 
 	next_ptr = (priv->tx_head + 1) & 15;
-	restore_flags(flags);
+	local_irq_restore(flags);
 
 	dev_kfree_skb(skb);