/* reserve 3 bytes for HW stop read */
 static int efuse_available_max_size = EFUSE_MAX_SIZE - 3 /*0x1FD*/;
 
-static void efuse_reg_ctrl(struct _adapter *padapter, u8 bPowerOn)
+static void efuse_reg_ctrl(struct _adapter *adapter, u8 bPowerOn)
 {
        u8 tmpu8 = 0;
 
                /* -----------------e-fuse pwr & clk reg ctrl ---------------
                 * Enable LDOE25 Macro Block
                 */
-               tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3);
+               tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3);
                tmpu8 |= 0x80;
-               r8712_write8(padapter, EFUSE_TEST + 3, tmpu8);
+               r8712_write8(adapter, EFUSE_TEST + 3, tmpu8);
                msleep(20); /* for some platform , need some delay time */
                /* Change Efuse Clock for write action to 40MHZ */
-               r8712_write8(padapter, EFUSE_CLK_CTRL, 0x03);
+               r8712_write8(adapter, EFUSE_CLK_CTRL, 0x03);
                msleep(20); /* for some platform , need some delay time */
        } else {
                /* -----------------e-fuse pwr & clk reg ctrl -----------------
                 * Disable LDOE25 Macro Block
                 */
-               tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3);
+               tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3);
                tmpu8 &= 0x7F;
-               r8712_write8(padapter, EFUSE_TEST + 3, tmpu8);
+               r8712_write8(adapter, EFUSE_TEST + 3, tmpu8);
                /* Change Efuse Clock for write action to 500K */
-               r8712_write8(padapter, EFUSE_CLK_CTRL, 0x02);
+               r8712_write8(adapter, EFUSE_CLK_CTRL, 0x02);
        }
 }
 
 /*
  * Before write E-Fuse, this function must be called.
  */
-u8 r8712_efuse_reg_init(struct _adapter *padapter)
+u8 r8712_efuse_reg_init(struct _adapter *adapter)
 {
        return true;
 }
 
-void r8712_efuse_reg_uninit(struct _adapter *padapter)
+void r8712_efuse_reg_uninit(struct _adapter *adapter)
 {
-       efuse_reg_ctrl(padapter, false);
+       efuse_reg_ctrl(adapter, false);
 }
 
-static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data)
+static u8 efuse_one_byte_read(struct _adapter *adapter, u16 addr, u8 *data)
 {
        u8 tmpidx = 0, bResult;
 
        /* -----------------e-fuse reg ctrl --------------------------------- */
-       r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
-       r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
-              (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC));
-       r8712_write8(padapter, EFUSE_CTRL + 3, 0x72); /* read cmd */
+       r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
+       r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
+              (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC));
+       r8712_write8(adapter, EFUSE_CTRL + 3, 0x72); /* read cmd */
        /* wait for complete */
-       while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) &&
+       while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
               (tmpidx < 100))
                tmpidx++;
        if (tmpidx < 100) {
-               *data = r8712_read8(padapter, EFUSE_CTRL);
+               *data = r8712_read8(adapter, EFUSE_CTRL);
                bResult = true;
        } else {
                *data = 0xff;
        return bResult;
 }
 
-static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data)
+static u8 efuse_one_byte_write(struct _adapter *adapter, u16 addr, u8 data)
 {
        u8 tmpidx = 0, bResult;
 
        /* -----------------e-fuse reg ctrl -------------------------------- */
-       r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
-       r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
-              (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC));
-       r8712_write8(padapter, EFUSE_CTRL, data); /* data */
-       r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
+       r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
+       r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
+              (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC));
+       r8712_write8(adapter, EFUSE_CTRL, data); /* data */
+       r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
        /* wait for complete */
-       while ((0x80 &  r8712_read8(padapter, EFUSE_CTRL + 3)) &&
+       while ((0x80 &  r8712_read8(adapter, EFUSE_CTRL + 3)) &&
               (tmpidx < 100))
                tmpidx++;
        if (tmpidx < 100)
        return bResult;
 }
 
-static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr,
+static u8 efuse_one_byte_rw(struct _adapter *adapter, u8 bRead, u16 addr,
                            u8 *data)
 {
        u8 tmpidx = 0, tmpv8 = 0, bResult;
 
        /* -----------------e-fuse reg ctrl --------------------------------- */
-       r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
+       r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
        tmpv8 = ((u8)((addr >> 8) & 0x03)) |
-                (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC);
-       r8712_write8(padapter, EFUSE_CTRL + 2, tmpv8);
+                (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC);
+       r8712_write8(adapter, EFUSE_CTRL + 2, tmpv8);
        if (bRead) {
-               r8712_write8(padapter, EFUSE_CTRL + 3,  0x72); /* read cmd */
-               while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) &&
+               r8712_write8(adapter, EFUSE_CTRL + 3,  0x72); /* read cmd */
+               while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
                       (tmpidx < 100))
                        tmpidx++;
                if (tmpidx < 100) {
-                       *data = r8712_read8(padapter, EFUSE_CTRL);
+                       *data = r8712_read8(adapter, EFUSE_CTRL);
                        bResult = true;
                } else {
                        *data = 0;
                        bResult = false;
                }
        } else {
-               r8712_write8(padapter, EFUSE_CTRL, *data); /* data */
-               r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
-               while ((0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) &&
+               r8712_write8(adapter, EFUSE_CTRL, *data); /* data */
+               r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
+               while ((0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
                       (tmpidx < 100))
                        tmpidx++;
                if (tmpidx < 100)
        return bResult;
 }
 
-static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty)
+static u8 efuse_is_empty(struct _adapter *adapter, u8 *empty)
 {
        u8 value, ret = true;
 
        /* read one byte to check if E-Fuse is empty */
-       if (efuse_one_byte_rw(padapter, true, 0, &value)) {
+       if (efuse_one_byte_rw(adapter, true, 0, &value)) {
                if (value == 0xFF)
                        *empty = true;
                else
        return ret;
 }
 
-void r8712_efuse_change_max_size(struct _adapter *padapter)
+void r8712_efuse_change_max_size(struct _adapter *adapter)
 {
        u16 pre_pg_data_saddr = 0x1FB;
        u16 i;
        u8 pre_pg_data[5];
 
        for (i = 0; i < pre_pg_data_size; i++)
-               efuse_one_byte_read(padapter, pre_pg_data_saddr + i,
+               efuse_one_byte_read(adapter, pre_pg_data_saddr + i,
                                    &pre_pg_data[i]);
        if ((pre_pg_data[0] == 0x03) && (pre_pg_data[1] == 0x00) &&
            (pre_pg_data[2] == 0x00) && (pre_pg_data[3] == 0x00) &&
                efuse_available_max_size -= pre_pg_data_size;
 }
 
-int r8712_efuse_get_max_size(struct _adapter *padapter)
+int r8712_efuse_get_max_size(struct _adapter *adapter)
 {
        return  efuse_available_max_size;
 }
        }
 }
 
-u16 r8712_efuse_get_current_size(struct _adapter *padapter)
+u16 r8712_efuse_get_current_size(struct _adapter *adapter)
 {
        int bContinual = true;
        u16 efuse_addr = 0;
        u8 hworden = 0;
        u8 efuse_data, word_cnts = 0;
 
-       while (bContinual && efuse_one_byte_read(padapter, efuse_addr,
+       while (bContinual && efuse_one_byte_read(adapter, efuse_addr,
               &efuse_data) && (efuse_addr < efuse_available_max_size)) {
                if (efuse_data != 0xFF) {
                        hworden =  efuse_data & 0x0F;
        return efuse_addr;
 }
 
-u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data)
+u8 r8712_efuse_pg_packet_read(struct _adapter *adapter, u8 offset, u8 *data)
 {
        u8 hoffset = 0, hworden = 0, word_cnts = 0;
        u16 efuse_addr = 0;
                return false;
        memset(data, 0xFF, sizeof(u8) * PGPKT_DATA_SIZE);
        while (efuse_addr < efuse_available_max_size) {
-               if (efuse_one_byte_read(padapter, efuse_addr, &efuse_data)) {
+               if (efuse_one_byte_read(adapter, efuse_addr, &efuse_data)) {
                        if (efuse_data == 0xFF)
                                break;
                        hoffset = (efuse_data >> 4) & 0x0F;
                                memset(tmpdata, 0xFF, PGPKT_DATA_SIZE);
                                for (tmpidx = 0; tmpidx < word_cnts * 2;
                                     tmpidx++) {
-                                       if (efuse_one_byte_read(padapter,
+                                       if (efuse_one_byte_read(adapter,
                                            efuse_addr + 1 + tmpidx,
                                            &efuse_data)) {
                                                tmpdata[tmpidx] = efuse_data;
        return ret;
 }
 
-static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
+static u8 fix_header(struct _adapter *adapter, u8 header, u16 header_addr)
 {
        struct PGPKT_STRUCT pkt;
        u8 offset, word_en, value;
        /* retrieve original data */
        addr = 0;
        while (addr < header_addr) {
-               if (!efuse_one_byte_read(padapter, addr++, &value)) {
+               if (!efuse_one_byte_read(adapter, addr++, &value)) {
                        ret = false;
                        break;
                }
                        if (BIT(i) & word_en) {
                                if (BIT(i) & pkt.word_en) {
                                        if (efuse_one_byte_read(
-                                                       padapter, addr,
+                                                       adapter, addr,
                                                        &value))
                                                pkt.data[i * 2] = value;
                                        else
                                                return false;
                                        if (efuse_one_byte_read(
-                                                       padapter,
+                                                       adapter,
                                                        addr + 1,
                                                        &value))
                                                pkt.data[i * 2 + 1] =
        /* fill original data */
        for (i = 0; i < PGPKG_MAX_WORDS; i++) {
                if (BIT(i) & pkt.word_en) {
-                       efuse_one_byte_write(padapter, addr, pkt.data[i * 2]);
-                       efuse_one_byte_write(padapter, addr + 1,
+                       efuse_one_byte_write(adapter, addr, pkt.data[i * 2]);
+                       efuse_one_byte_write(adapter, addr + 1,
                                             pkt.data[i * 2 + 1]);
                        /* additional check */
-                       if (!efuse_one_byte_read(padapter, addr, &value)) {
+                       if (!efuse_one_byte_read(adapter, addr, &value)) {
                                ret = false;
                        } else if (pkt.data[i * 2] != value) {
                                ret = false;
                                if (value == 0xFF) /* write again */
-                                       efuse_one_byte_write(padapter, addr,
+                                       efuse_one_byte_write(adapter, addr,
                                                             pkt.data[i * 2]);
                        }
-                       if (!efuse_one_byte_read(padapter, addr + 1, &value)) {
+                       if (!efuse_one_byte_read(adapter, addr + 1, &value)) {
                                ret = false;
                        } else if (pkt.data[i * 2 + 1] != value) {
                                ret = false;
                                if (value == 0xFF) /* write again */
-                                       efuse_one_byte_write(padapter, addr + 1,
+                                       efuse_one_byte_write(adapter, addr + 1,
                                                             pkt.data[i * 2 +
                                                                      1]);
                        }
        return ret;
 }
 
-u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
+u8 r8712_efuse_pg_packet_write(struct _adapter *adapter, const u8 offset,
                               const u8 word_en, const u8 *data)
 {
        u8 pg_header = 0;
        u8 bResult = true;
 
        /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */
-       efuse_data = r8712_read8(padapter, EFUSE_CLK_CTRL);
+       efuse_data = r8712_read8(adapter, EFUSE_CLK_CTRL);
        if (efuse_data != 0x03)
                return false;
        pg_header = MAKE_EFUSE_HEADER(offset, word_en);
        repeat_times = 0;
        efuse_addr = 0;
        while (efuse_addr < efuse_available_max_size) {
-               curr_size = r8712_efuse_get_current_size(padapter);
+               curr_size = r8712_efuse_get_current_size(adapter);
                if ((curr_size + 1 + target_word_cnts * 2) >
                     efuse_available_max_size)
                        return false; /*target_word_cnts + pg header(1 byte)*/
                efuse_addr = curr_size; /* current size is also the last addr*/
-               efuse_one_byte_write(padapter, efuse_addr, pg_header); /*hdr*/
+               efuse_one_byte_write(adapter, efuse_addr, pg_header); /*hdr*/
                sub_repeat = 0;
                /* check if what we read is what we write */
-               while (!efuse_one_byte_read(padapter, efuse_addr,
+               while (!efuse_one_byte_read(adapter, efuse_addr,
                                            &efuse_data)) {
                        if (++sub_repeat > _REPEAT_THRESHOLD_) {
                                bResult = false; /* continue to blind write */
                        /* go to next address */
                        efuse_addr++;
                        for (i = 0; i < target_word_cnts * 2; i++) {
-                               efuse_one_byte_write(padapter,
+                               efuse_one_byte_write(adapter,
                                                     efuse_addr + i,
                                                     *(data + i));
-                               if (!efuse_one_byte_read(padapter,
+                               if (!efuse_one_byte_read(adapter,
                                                         efuse_addr + i,
                                                         &efuse_data))
                                        bResult = false;
                if (efuse_data == 0xFF)
                        return bResult; /* nothing damaged. */
                /* call rescue procedure */
-               if (!fix_header(padapter, efuse_data, efuse_addr))
+               if (!fix_header(adapter, efuse_data, efuse_addr))
                        return false; /* rescue fail */
 
                if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */
        return bResult;
 }
 
-u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,
+u8 r8712_efuse_access(struct _adapter *adapter, u8 bRead, u16 start_addr,
                      u16 cnts, u8 *data)
 {
        int i;
        if (!bRead && ((start_addr + cnts) >
           efuse_available_max_size))
                return false;
-       if (!bRead && !r8712_efuse_reg_init(padapter))
+       if (!bRead && !r8712_efuse_reg_init(adapter))
                return false;
        /* -----------------e-fuse one byte read / write ---------------------*/
        for (i = 0; i < cnts; i++) {
                        res = false;
                        break;
                }
-               res = efuse_one_byte_rw(padapter, bRead, start_addr + i,
+               res = efuse_one_byte_rw(adapter, bRead, start_addr + i,
                                        data + i);
                if (!bRead && !res)
                        break;
        }
        if (!bRead)
-               r8712_efuse_reg_uninit(padapter);
+               r8712_efuse_reg_uninit(adapter);
        return res;
 }
 
-u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr, u16 cnts, u8 *data)
+u8 r8712_efuse_map_read(struct _adapter *adapter, u16 addr, u16 cnts, u8 *data)
 {
        u8 offset, ret = true;
        u8 pktdata[PGPKT_DATA_SIZE];
 
        if ((addr + cnts) > EFUSE_MAP_MAX_SIZE)
                return false;
-       if (efuse_is_empty(padapter, &offset) && offset) {
+       if (efuse_is_empty(adapter, &offset) && offset) {
                for (i = 0; i < cnts; i++)
                        data[i] = 0xFF;
                return ret;
        }
        offset = (addr >> 3) & 0xF;
-       ret = r8712_efuse_pg_packet_read(padapter, offset, pktdata);
+       ret = r8712_efuse_pg_packet_read(adapter, offset, pktdata);
        i = addr & 0x7; /* pktdata index */
        idx = 0;        /* data index */
 
                                return ret;
                }
                offset++;
-               if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata))
+               if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata))
                        ret = false;
                i = 0;
        } while (1);
        return ret;
 }
 
-u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
+u8 r8712_efuse_map_write(struct _adapter *adapter, u16 addr, u16 cnts,
                         u8 *data)
 {
        u8 offset, word_en, empty;
        if ((addr + cnts) > EFUSE_MAP_MAX_SIZE)
                return false;
        /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */
-       empty = r8712_read8(padapter, EFUSE_CLK_CTRL);
+       empty = r8712_read8(adapter, EFUSE_CLK_CTRL);
        if (empty != 0x03)
                return false;
-       if (efuse_is_empty(padapter, &empty)) {
+       if (efuse_is_empty(adapter, &empty)) {
                if (empty)
                        memset(pktdata, 0xFF, PGPKT_DATA_SIZE);
        } else {
        }
        offset = (addr >> 3) & 0xF;
        if (!empty)
-               if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata))
+               if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata))
                        return false;
        word_en = 0xF;
        memset(newdata, 0xFF, PGPKT_DATA_SIZE);
                }
 
                if (word_en != 0xF)
-                       if (!r8712_efuse_pg_packet_write(padapter, offset,
+                       if (!r8712_efuse_pg_packet_write(adapter, offset,
                                                         word_en, newdata))
                                return false;
                if (idx == cnts)
                        break;
                offset++;
                if (!empty)
-                       if (!r8712_efuse_pg_packet_read(padapter, offset,
+                       if (!r8712_efuse_pg_packet_read(adapter, offset,
                                                        pktdata))
                                return false;
                i = 0;