Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / mwave / 3780i.c

diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 613aed9e1840a15e4843e396591dc205a5ceecf1..492dbfb2efd678c0cc0798be8f70f054740b51b4 100644 (file)
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -46,13 +46,14 @@
 *      First release to the public
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/unistd.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/sched.h>       /* cond_resched() */
+
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -62,8 +63,6 @@
 #include "3780i.h"
 
 static DEFINE_SPINLOCK(dsp_lock);
-static unsigned long flags;
-
 
 static void PaceMsaAccess(unsigned short usDspBaseIO)
 {
@@ -75,6 +74,7 @@ static void PaceMsaAccess(unsigned short usDspBaseIO)
 unsigned short dsp3780I_ReadMsaCfg(unsigned short usDspBaseIO,
                                    unsigned long ulMsaAddr)
 {
+       unsigned long flags;
        unsigned short val;
 
        PRINTK_3(TRACE_3780I,
@@ -95,6 +95,7 @@ unsigned short dsp3780I_ReadMsaCfg(unsigned short usDspBaseIO,
 void dsp3780I_WriteMsaCfg(unsigned short usDspBaseIO,
                           unsigned long ulMsaAddr, unsigned short usValue)
 {
+       unsigned long flags;
 
        PRINTK_4(TRACE_3780I,
                "3780i::dsp3780i_WriteMsaCfg entry usDspBaseIO %x ulMsaAddr %lx usValue %x\n",
@@ -174,6 +175,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
                        unsigned short *pIrqMap,
                        unsigned short *pDmaMap)
 {
+       unsigned long flags;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
        int i;
        DSP_UART_CFG_1 rUartCfg1;
@@ -353,6 +355,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
 
 int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings)
 {
+       unsigned long flags;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
        DSP_ISA_SLAVE_CONTROL rSlaveControl;
 
@@ -382,6 +385,7 @@ int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings)
 
 int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings)
 {
+       unsigned long flags;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
        DSP_BOOT_DOMAIN rBootDomain;
        DSP_HBRIDGE_CONTROL rHBridgeControl;
@@ -426,6 +430,7 @@ int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings)
 
 int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings)
 {
+       unsigned long flags;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
        DSP_BOOT_DOMAIN rBootDomain;
        DSP_HBRIDGE_CONTROL rHBridgeControl;
@@ -472,6 +477,7 @@ int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings)
 int dsp3780I_ReadDStore(unsigned short usDspBaseIO, void __user *pvBuffer,
                         unsigned uCount, unsigned long ulDSPAddr)
 {
+       unsigned long flags;
        unsigned short __user *pusBuffer = pvBuffer;
        unsigned short val;
 
@@ -513,6 +519,7 @@ int dsp3780I_ReadAndClearDStore(unsigned short usDspBaseIO,
                                 void __user *pvBuffer, unsigned uCount,
                                 unsigned long ulDSPAddr)
 {
+       unsigned long flags;
        unsigned short __user *pusBuffer = pvBuffer;
        unsigned short val;
 
@@ -554,6 +561,7 @@ int dsp3780I_ReadAndClearDStore(unsigned short usDspBaseIO,
 int dsp3780I_WriteDStore(unsigned short usDspBaseIO, void __user *pvBuffer,
                          unsigned uCount, unsigned long ulDSPAddr)
 {
+       unsigned long flags;
        unsigned short __user *pusBuffer = pvBuffer;
 
 
@@ -595,6 +603,7 @@ int dsp3780I_WriteDStore(unsigned short usDspBaseIO, void __user *pvBuffer,
 int dsp3780I_ReadIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
                         unsigned uCount, unsigned long ulDSPAddr)
 {
+       unsigned long flags;
        unsigned short __user *pusBuffer = pvBuffer;
 
        PRINTK_5(TRACE_3780I,
@@ -642,6 +651,7 @@ int dsp3780I_ReadIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
 int dsp3780I_WriteIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
                          unsigned uCount, unsigned long ulDSPAddr)
 {
+       unsigned long flags;
        unsigned short __user *pusBuffer = pvBuffer;
 
        PRINTK_5(TRACE_3780I,
@@ -690,6 +700,7 @@ int dsp3780I_WriteIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
 int dsp3780I_GetIPCSource(unsigned short usDspBaseIO,
                           unsigned short *pusIPCSource)
 {
+       unsigned long flags;
        DSP_HBRIDGE_CONTROL rHBridgeControl;
        unsigned short temp;