redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

brcmfmac: rename nvram.[ch] for upcoming firmware handling functions 

The firmware processing will be modified to use asynchronous request
firmware api. In preparation this patch is simple rename of source
and header file to which the functionality will be added.

Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
hifive-unleashed-5.1
Arend van Spriel 2014-05-27 12:56:17 +02:00 committed by John W. Linville
parent f33d7a9141
commit dabedab983
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/brcm80211/brcmfmac/Makefile
View File

@ -33,7 +33,7 @@ brcmfmac-objs += \
bcdc.o \
dhd_common.o \
dhd_linux.o \
nvram.o \
firmware.o \
btcoex.o
brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
dhd_sdio.o \

6
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -42,7 +42,7 @@
#include <soc.h>
#include "sdio_host.h"
#include "chip.h"
#include "nvram.h"
#include "firmware.h"
#define DCMD_RESP_TIMEOUT 2000 /* In milli second */
@ -3287,7 +3287,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus,
brcmf_dbg(TRACE, "Enter\n");
vars = brcmf_nvram_strip(nv, &varsz);
vars = brcmf_fw_nvram_strip(nv, &varsz);
if (vars == NULL)
return -EINVAL;
@ -3300,7 +3300,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus,
else if (!brcmf_sdio_verifymemory(bus->sdiodev, address, vars, varsz))
err = -EIO;
brcmf_nvram_free(vars);
brcmf_fw_nvram_free(vars);
return err;
}

6
drivers/net/wireless/brcm80211/brcmfmac/nvram.c → drivers/net/wireless/brcm80211/brcmfmac/firmware.c
View File

@ -19,7 +19,7 @@
#include <linux/firmware.h>
#include "dhd_dbg.h"
#include "nvram.h"
#include "firmware.h"
enum nvram_parser_state {
IDLE,
@ -187,7 +187,7 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
* and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
* End of buffer is completed with token identifying length of buffer.
*/
void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length)
void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length)
{
struct nvram_parser nvp;
u32 pad;
@ -219,7 +219,7 @@ void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length)
return nvp.nvram;
}
void brcmf_nvram_free(void *nvram)
void brcmf_fw_nvram_free(void *nvram)
{
kfree(nvram);
}

10
drivers/net/wireless/brcm80211/brcmfmac/nvram.h → drivers/net/wireless/brcm80211/brcmfmac/firmware.h
View File

@ -13,12 +13,12 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef BRCMFMAC_NVRAM_H
#define BRCMFMAC_NVRAM_H
#ifndef BRCMFMAC_FIRMWARE_H
#define BRCMFMAC_FIRMWARE_H
void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length);
void brcmf_nvram_free(void *nvram);
void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length);
void brcmf_fw_nvram_free(void *nvram);
#endif /* BRCMFMAC_NVRAM_H */
#endif /* BRCMFMAC_FIRMWARE_H */