diff options
Diffstat (limited to 'drivers/staging/rtl8712/hal_init.c')
-rw-r--r-- | drivers/staging/rtl8712/hal_init.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 1d6ade05fa18..324da34383ea 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -86,7 +86,7 @@ static u32 rtl871x_open_fw(struct _adapter *padapter, const u8 **ppmappedfw) (int)padapter->fw->size); return 0; } - *ppmappedfw = (u8 *)((*praw)->data); + *ppmappedfw = (*praw)->data; return (*praw)->size; } @@ -136,15 +136,10 @@ static void update_fwhdr(struct fw_hdr *pfwhdr, const u8 *pmappedfw) static u8 chk_fwhdr(struct fw_hdr *pfwhdr, u32 ulfilelength) { u32 fwhdrsz, fw_sz; - u8 intf, rfconf; /* check signature */ if ((pfwhdr->signature != 0x8712) && (pfwhdr->signature != 0x8192)) return _FAIL; - /* check interface */ - intf = (u8)((pfwhdr->version&0x3000) >> 12); - /* check rf_conf */ - rfconf = (u8)((pfwhdr->version&0xC000) >> 14); /* check fw_priv_sze & sizeof(struct fw_priv) */ if (pfwhdr->fw_priv_sz != sizeof(struct fw_priv)) return _FAIL; @@ -162,7 +157,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) sint i; u8 tmp8, tmp8_a; u16 tmp16; - u32 maxlen = 0, tmp32; /* for compare usage */ + u32 maxlen = 0; /* for compare usage */ uint dump_imem_sz, imem_sz, dump_emem_sz, emem_sz; /* max = 49152; */ struct fw_hdr fwhdr; u32 ulfilelength; /* FW file size */ @@ -262,7 +257,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) if (tmp8_a != (tmp8|BIT(2))) goto exit_fail; - tmp32 = r8712_read32(padapter, TCR); + r8712_read32(padapter, TCR); /* 4.polling IMEM Ready */ i = 100; |