These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8712 / rtl871x_eeprom.c

diff --git a/kernel/drivers/staging/rtl8712/rtl871x_eeprom.c b/kernel/drivers/staging/rtl8712/rtl871x_eeprom.c
index 50339e6..4e71361 100644 (file)
--- a/kernel/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/kernel/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -49,7 +49,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
 {
        u16 x, mask;
 
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                goto out;
        mask = 0x01 << (count - 1);
        x = r8712_read8(padapter, EE_9346CR);
@@ -58,7 +58,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
                x &= ~_EEDI;
                if (data & mask)
                        x |= _EEDI;
-               if (padapter->bSurpriseRemoved == true)
+               if (padapter->bSurpriseRemoved)
                        goto out;
                r8712_write8(padapter, EE_9346CR, (u8)x);
                udelay(CLOCK_RATE);
@@ -66,7 +66,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
                down_clk(padapter, &x);
                mask >>= 1;
        } while (mask);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                goto out;
        x &= ~_EEDI;
        r8712_write8(padapter, EE_9346CR, (u8)x);
@@ -77,7 +77,7 @@ static u16 shift_in_bits(struct _adapter *padapter)
 {
        u16 x, d = 0, i;
 
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                goto out;
        x = r8712_read8(padapter, EE_9346CR);
        x &= ~(_EEDO | _EEDI);
@@ -85,7 +85,7 @@ static u16 shift_in_bits(struct _adapter *padapter)
        for (i = 0; i < 16; i++) {
                d <<= 1;
                up_clk(padapter, &x);
-               if (padapter->bSurpriseRemoved == true)
+               if (padapter->bSurpriseRemoved)
                        goto out;
                x = r8712_read8(padapter, EE_9346CR);
                x &= ~(_EEDI);
@@ -129,17 +129,17 @@ static void eeprom_clean(struct _adapter *padapter)
 {
        u16 x;
 
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                return;
        x = r8712_read8(padapter, EE_9346CR);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                return;
        x &= ~(_EECS | _EEDI);
        r8712_write8(padapter, EE_9346CR, (u8)x);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                return;
        up_clk(padapter, &x);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                return;
        down_clk(padapter, &x);
 }
@@ -206,11 +206,11 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/
        tmp8_clk_new = tmp8_clk_ori | 0x20;
        if (tmp8_clk_new != tmp8_clk_ori)
                r8712_write8(padapter, 0x10250003, tmp8_clk_new);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                goto out;
        /* select EEPROM, reset bits, set _EECS */
        x = r8712_read8(padapter, EE_9346CR);
-       if (padapter->bSurpriseRemoved == true)
+       if (padapter->bSurpriseRemoved)
                goto out;
        x &= ~(_EEDI | _EEDO | _EESK | _EEM0);
        x |= _EEM1 | _EECS;