[PATCH] M68k local_irq*() updates

Convert core Amiga code to new local_irq*() framework

diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c
index b6a01b2c05cbf74d15999d5d06af65e1fafc622f..c0129389d3a8b3f15c28b554c29c2ff2c43d15c9 100644 (file)
--- a/arch/m68k/amiga/amiints.c
+++ b/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__);
 }
 

diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c
index efec739136fe97e4da5e87a6d3d0854cb39a713b..5a2574170f67d4fd00cac4dd4c9826316f22511f 100644 (file)
--- a/arch/m68k/amiga/amisound.c
+++ b/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);
 }