projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: brcm80211: remove usage of struct osl_info for register access
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
brcm80211
/
util
/
nvram
/
nvram_ro.c
diff --git
a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index ec40779451402948d96e60e62679bda473ee1e41..a5e8c4daaa15165476da4d0ffd7f9528a93c6ed3 100644
(file)
--- a/
drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/
drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@
-48,13
+48,10
@@
static char *findvar(char *vars, char *lim, const char *name);
/* copy flash to ram */
static void get_flash_nvram(si_t *sih, struct nvram_header *nvh)
{
/* copy flash to ram */
static void get_flash_nvram(si_t *sih, struct nvram_header *nvh)
{
- struct osl_info *osh;
uint nvs, bufsz;
vars_t *new;
uint nvs, bufsz;
vars_t *new;
- osh = si_osh(sih);
-
- nvs = R_REG(osh, &nvh->len) - sizeof(struct nvram_header);
+ nvs = R_REG(&nvh->len) - sizeof(struct nvram_header);
bufsz = nvs + VARS_T_OH;
new = kmalloc(bufsz, GFP_ATOMIC);
bufsz = nvs + VARS_T_OH;
new = kmalloc(bufsz, GFP_ATOMIC);