[PATCH] M68k local_irq*() updates

Convert core Amiga code to new local_irq*() framework

arch/m68k/amiga/amiints.c

@@ -128,8 +128,7 @@ static inline int amiga_insert_irq(irq_node_t **list, irq_node_t *node)
 		printk("%s: Warning: dev_id of %s is zero\n",
 		       __FUNCTION__, node->devname);
 
-	save_flags(flags);
-	cli();
+	local_irq_save(flags);
 
 	cur = *list;
 
@@ -153,7 +152,7 @@ static inline int amiga_insert_irq(irq_node_t **list, irq_node_t *node)
 	node->next = cur;
 	*list = node;
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 	return 0;
 }
 
@@ -162,19 +161,18 @@ static inline void amiga_delete_irq(irq_node_t **list, void *dev_id)
 	unsigned long flags;
 	irq_node_t *node;
 
-	save_flags(flags);
-	cli();
+	local_irq_save(flags);
 
 	for (node = *list; node; list = &node->next, node = *list) {
 		if (node->dev_id == dev_id) {
 			*list = node->next;
 			/* Mark it as free. */
 			node->handler = NULL;
-			restore_flags(flags);
+			local_irq_restore(flags);
 			return;
 		}
 	}
-	restore_flags(flags);
+	local_irq_restore(flags);
 	printk ("%s: tried to remove invalid irq\n", __FUNCTION__);
 }
 

arch/m68k/amiga/amisound.c

@@ -71,8 +71,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks )
 	if (!snd_data)
 		return;
 
-	save_flags(flags);
-	cli();
+	local_irq_save(flags);
 	del_timer( &sound_timer );
 
 	if (hz > 20 && hz < 32767) {
@@ -100,7 +99,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks )
 	} else
 		nosound( 0 );
 
-	restore_flags(flags);
+	local_irq_restore(flags);
 }