[PATCH] 2.5.29 sound/oss/trident.c [2/2] remove cli/sti calls

From: Muli Ben-Yehuda (mulix@actcom.co.il)
Date: Sun Jul 28 2002 - 15:22:07 EST

Hello,

This patch replaces the cli/sti calls in the trident.c driver with
spin_lock_irqsave/spin_unlock_irqrestore.

Patch is against 2.5.29 (latest bitkeeper), compiled and
tested. Please apply.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.480 -> 1.481
# sound/oss/trident.c 1.23 -> 1.24
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/28 mulix@alhambra.merseine.nu 1.481
# get rid of cli/sti
# --------------------------------------------
#
diff -Nru a/sound/oss/trident.c b/sound/oss/trident.c
--- a/sound/oss/trident.c Sun Jul 28 23:09:05 2002
+++ b/sound/oss/trident.c Sun Jul 28 23:09:05 2002
@@ -768,9 +768,8 @@
           * Keep interrupts off for the configure - we don't want to
           * clash with another cyberpro config event
           */
-
- save_flags(flags);
- cli();
+
+ spin_lock_irqsave(&card->lock, flags);
         portDat = cyber_inidx(CYBER_PORT_AUDIO, CYBER_IDX_AUDIO_ENABLE);
         /* enable, if it was disabled */
         if( (portDat & CYBER_BMSK_AUENZ) != CYBER_BMSK_AUENZ_ENABLE ) {
@@ -795,7 +794,7 @@
                 cyber_outidx( CYBER_PORT_AUDIO, 0xb3, 0x06 );
                 cyber_outidx( CYBER_PORT_AUDIO, 0xbf, 0x00 );
         }
- restore_flags(flags);
+ spin_unlock_irqrestore(&card->lock, flags);
         return ret;
 }
 
@@ -3502,9 +3501,8 @@
         unsigned long flags;
         int i, j;
 
- save_flags(flags);
- cli();
-
+ spin_lock_irqsave(&card->lock, flags);
+
         ali_registers.global_regs[0x2c] = inl(TRID_REG(card,T4D_MISCINT));
         //ali_registers.global_regs[0x20] = inl(TRID_REG(card,T4D_START_A));
         ali_registers.global_regs[0x21] = inl(TRID_REG(card,T4D_STOP_A));
@@ -3532,7 +3530,7 @@
         //Stop all HW channel
         outl(ALI_STOP_ALL_CHANNELS, TRID_REG(card, T4D_STOP_A));
 
- restore_flags(flags);
+ spin_unlock_irqrestore(&card->lock, flags);
 }
 
 static void ali_restore_regs(struct trident_card *card)
@@ -3540,8 +3538,7 @@
         unsigned long flags;
         int i, j;
 
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&card->lock, flags);
         
         for (i = 1; i < ALI_MIXER_REGS; i++)
                 ali_ac97_write(card->ac97_codec[0], i*2, ali_registers.mixer_regs[i]);
@@ -3564,6 +3561,8 @@
         outl(ali_registers.global_regs[0x20], TRID_REG(card,T4D_START_A));
         //restore IRQ enable bits
         outl(ali_registers.global_regs[0x2c], TRID_REG(card,T4D_MISCINT));
+
+ spin_unlock_irqrestore(&card->lock, flags);
         
         restore_flags(flags);
 } 

-- 
http://vipe.technion.ac.il/~mulix/
http://syscalltrack.sf.net/
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Tue Jul 30 2002 - 14:00:30 EST