Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / char / mwave / tp3780i.c

diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
index 04e6d6a27994392f14e72aa1a45e0c8525fa52fb..5e1618a76b2a31df845d9b9c16787b20207a8a02 100644 (file)
--- a/drivers/char/mwave/tp3780i.c
+++ b/drivers/char/mwave/tp3780i.c
@@ -80,13 +80,13 @@ static void EnableSRAM(THINKPAD_BD_DATA * pBDData)
        WriteMsaCfg(DSP_GpioModeControl_15_8, MKWORD(rGpioMode));
 
        MKWORD(rGpioDriverEnable) = 0;
-       rGpioDriverEnable.Enable10 = TRUE;
-       rGpioDriverEnable.Mask10 = TRUE;
+       rGpioDriverEnable.Enable10 = true;
+       rGpioDriverEnable.Mask10 = true;
        WriteMsaCfg(DSP_GpioDriverEnable_15_8, MKWORD(rGpioDriverEnable));
 
        MKWORD(rGpioOutputData) = 0;
        rGpioOutputData.Latch10 = 0;
-       rGpioOutputData.Mask10 = TRUE;
+       rGpioOutputData.Mask10 = true;
        WriteMsaCfg(DSP_GpioOutputData_15_8, MKWORD(rGpioOutputData));
 
        PRINTK_1(TRACE_TP3780I, "tp3780i::EnableSRAM exit\n");
@@ -127,7 +127,7 @@ static irqreturn_t DspInterrupt(int irq, void *dev_id)
                                PRINTK_2(TRACE_TP3780I,
                                        "tp3780i::DspInterrupt usIntCount %x\n",
                                        pDrvData->IPCs[usPCNum - 1].usIntCount);
-                               if (pDrvData->IPCs[usPCNum - 1].bIsEnabled == TRUE) {
+                               if (pDrvData->IPCs[usPCNum - 1].bIsEnabled == true) {
                                        PRINTK_2(TRACE_TP3780I,
                                                "tp3780i::DspInterrupt, waking up usPCNum %x\n",
                                                usPCNum - 1);
@@ -160,8 +160,8 @@ int tp3780I_InitializeBoardData(THINKPAD_BD_DATA * pBDData)
 
        PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_InitializeBoardData entry pBDData %p\n", pBDData);
 
-       pBDData->bDSPEnabled = FALSE;
-       pSettings->bInterruptClaimed = FALSE;
+       pBDData->bDSPEnabled = false;
+       pSettings->bInterruptClaimed = false;
 
        retval = smapi_init();
        if (retval) {
@@ -269,7 +269,7 @@ int tp3780I_ReleaseResources(THINKPAD_BD_DATA * pBDData)
 
        if (pSettings->bInterruptClaimed) {
                free_irq(pSettings->usDspIrq, NULL);
-               pSettings->bInterruptClaimed = FALSE;
+               pSettings->bInterruptClaimed = false;
        }
 
        PRINTK_2(TRACE_TP3780I,
@@ -283,7 +283,7 @@ int tp3780I_ReleaseResources(THINKPAD_BD_DATA * pBDData)
 int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 {
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
-       BOOLEAN bDSPPoweredUp = FALSE, bInterruptAllocated = FALSE;
+       bool bDSPPoweredUp = false, bInterruptAllocated = false;
 
        PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_EnableDSP entry pBDData %p\n", pBDData);
 
@@ -336,14 +336,14 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
                }
        }
 
-       pSettings->bDspIrqActiveLow = pSettings->bDspIrqPulse = TRUE;
-       pSettings->bUartIrqActiveLow = pSettings->bUartIrqPulse = TRUE;
+       pSettings->bDspIrqActiveLow = pSettings->bDspIrqPulse = true;
+       pSettings->bUartIrqActiveLow = pSettings->bUartIrqPulse = true;
 
        if (pBDData->bShareDspIrq) {
-               pSettings->bDspIrqActiveLow = FALSE;
+               pSettings->bDspIrqActiveLow = false;
        }
        if (pBDData->bShareUartIrq) {
-               pSettings->bUartIrqActiveLow = FALSE;
+               pSettings->bUartIrqActiveLow = false;
        }
 
        pSettings->usNumTransfers = TP_CFG_NumTransfers;
@@ -373,16 +373,16 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
                PRINTK_3(TRACE_TP3780I,
                        "tp3780i::tp3780I_EnableDSP, got interrupt %x bShareDspIrq %x\n",
                        pSettings->usDspIrq, pBDData->bShareDspIrq);
-               bInterruptAllocated = TRUE;
-               pSettings->bInterruptClaimed = TRUE;
+               bInterruptAllocated = true;
+               pSettings->bInterruptClaimed = true;
        }
 
-       smapi_set_DSP_power_state(FALSE);
-       if (smapi_set_DSP_power_state(TRUE)) {
-               PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: smapi_set_DSP_power_state(TRUE) failed\n");
+       smapi_set_DSP_power_state(false);
+       if (smapi_set_DSP_power_state(true)) {
+               PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: smapi_set_DSP_power_state(true) failed\n");
                goto exit_cleanup;
        } else {
-               bDSPPoweredUp = TRUE;
+               bDSPPoweredUp = true;
        }
 
        if (dsp3780I_EnableDSP(pSettings, s_ausThinkpadIrqToField, s_ausThinkpadDmaToField)) {
@@ -392,7 +392,7 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 
        EnableSRAM(pBDData);
 
-       pBDData->bDSPEnabled = TRUE;
+       pBDData->bDSPEnabled = true;
 
        PRINTK_1(TRACE_TP3780I, "tp3780i::tp3780I_EnableDSP exit\n");
 
@@ -401,10 +401,10 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 exit_cleanup:
        PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Cleaning up\n");
        if (bDSPPoweredUp)
-               smapi_set_DSP_power_state(FALSE);
+               smapi_set_DSP_power_state(false);
        if (bInterruptAllocated) {
                free_irq(pSettings->usDspIrq, NULL);
-               pSettings->bInterruptClaimed = FALSE;
+               pSettings->bInterruptClaimed = false;
        }
        return -EIO;
 }
@@ -421,10 +421,10 @@ int tp3780I_DisableDSP(THINKPAD_BD_DATA * pBDData)
                dsp3780I_DisableDSP(&pBDData->rDspSettings);
                if (pSettings->bInterruptClaimed) {
                        free_irq(pSettings->usDspIrq, NULL);
-                       pSettings->bInterruptClaimed = FALSE;
+                       pSettings->bInterruptClaimed = false;
                }
-               smapi_set_DSP_power_state(FALSE);
-               pBDData->bDSPEnabled = FALSE;
+               smapi_set_DSP_power_state(false);
+               pBDData->bDSPEnabled = false;
        }
 
        PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_DisableDSP exit retval %x\n", retval);
@@ -516,7 +516,7 @@ int tp3780I_ReadWriteDspDStore(THINKPAD_BD_DATA * pBDData, unsigned int uOpcode,
        int retval = 0;
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
-       BOOLEAN bRC = 0;
+       bool bRC = 0;
 
        PRINTK_6(TRACE_TP3780I,
                "tp3780i::tp3780I_ReadWriteDspDStore entry pBDData %p, uOpcode %x, pvBuffer %p, uCount %x, ulDSPAddr %lx\n",
@@ -552,7 +552,7 @@ int tp3780I_ReadWriteDspIStore(THINKPAD_BD_DATA * pBDData, unsigned int uOpcode,
        int retval = 0;
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
        unsigned short usDspBaseIO = pSettings->usDspBaseIO;
-       BOOLEAN bRC = 0;
+       bool bRC = 0;
 
        PRINTK_6(TRACE_TP3780I,
                "tp3780i::tp3780I_ReadWriteDspIStore entry pBDData %p, uOpcode %x, pvBuffer %p, uCount %x, ulDSPAddr %lx\n",