u16 x, mask;
 _func_enter_;
 
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        mask = 0x01 << (count - 1);
        x = rtw_read8(padapter, EE_9346CR);
 
                x &= ~_EEDI;
                if (data & mask)
                        x |= _EEDI;
-               if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
-               goto out;
-               }
+               if (padapter->bSurpriseRemoved == true)
+                       goto out;
+
                rtw_write8(padapter, EE_9346CR, (u8)x);
                udelay(CLOCK_RATE);
                up_clk(padapter, &x);
                down_clk(padapter, &x);
                mask = mask >> 1;
        } while (mask);
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        x &= ~_EEDI;
        rtw_write8(padapter, EE_9346CR, (u8)x);
 out:
 {
        u16 x, d = 0, i;
 _func_enter_;
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        x = rtw_read8(padapter, EE_9346CR);
 
        x &= ~(_EEDO | _EEDI);
        for (i = 0; i < 16; i++) {
                d = d << 1;
                up_clk(padapter, &x);
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
                x = rtw_read8(padapter, EE_9346CR);
 
                x &= ~(_EEDI);
 {
        u16 x;
 _func_enter_;
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        x = rtw_read8(padapter, EE_9346CR);
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        x &= ~(_EECS | _EEDI);
        rtw_write8(padapter, EE_9346CR, (u8)x);
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        up_clk(padapter, &x);
-               if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        down_clk(padapter, &x);
 out:
 _func_exit_;
 
 _func_enter_;
 
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
+
        /* select EEPROM, reset bits, set _EECS*/
        x = rtw_read8(padapter, EE_9346CR);
 
-       if (padapter->bSurpriseRemoved == true) {
-               RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, ("padapter->bSurpriseRemoved==true"));
+       if (padapter->bSurpriseRemoved == true)
                goto out;
-       }
 
        x &= ~(_EEDI | _EEDO | _EESK | _EEM0);
        x |= _EEM1 | _EECS;