aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2014-05-27 06:56:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-29 13:08:12 -0400
commitdabedab98317e8915eefd8485921fb571b26cdd1 (patch)
tree5413ff78a938d48086e801f5ac03cfb251163dda
parentf33d7a914125423e357693f972512fa9c94fd3aa (diff)
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>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/Makefile2
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c6
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/firmware.c (renamed from drivers/net/wireless/brcm80211/brcmfmac/nvram.c)6
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/firmware.h (renamed from drivers/net/wireless/brcm80211/brcmfmac/nvram.h)10
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index 1d2ceac3a221..98e67c18f276 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
@@ -33,7 +33,7 @@ brcmfmac-objs += \
33 bcdc.o \ 33 bcdc.o \
34 dhd_common.o \ 34 dhd_common.o \
35 dhd_linux.o \ 35 dhd_linux.o \
36 nvram.o \ 36 firmware.o \
37 btcoex.o 37 btcoex.o
38brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ 38brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
39 dhd_sdio.o \ 39 dhd_sdio.o \
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 494371ccf0f7..010e1bd521f0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -42,7 +42,7 @@
42#include <soc.h> 42#include <soc.h>
43#include "sdio_host.h" 43#include "sdio_host.h"
44#include "chip.h" 44#include "chip.h"
45#include "nvram.h" 45#include "firmware.h"
46 46
47#define DCMD_RESP_TIMEOUT 2000 /* In milli second */ 47#define DCMD_RESP_TIMEOUT 2000 /* In milli second */
48 48
@@ -3287,7 +3287,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus,
3287 3287
3288 brcmf_dbg(TRACE, "Enter\n"); 3288 brcmf_dbg(TRACE, "Enter\n");
3289 3289
3290 vars = brcmf_nvram_strip(nv, &varsz); 3290 vars = brcmf_fw_nvram_strip(nv, &varsz);
3291 3291
3292 if (vars == NULL) 3292 if (vars == NULL)
3293 return -EINVAL; 3293 return -EINVAL;
@@ -3300,7 +3300,7 @@ static int brcmf_sdio_download_nvram(struct brcmf_sdio *bus,
3300 else if (!brcmf_sdio_verifymemory(bus->sdiodev, address, vars, varsz)) 3300 else if (!brcmf_sdio_verifymemory(bus->sdiodev, address, vars, varsz))
3301 err = -EIO; 3301 err = -EIO;
3302 3302
3303 brcmf_nvram_free(vars); 3303 brcmf_fw_nvram_free(vars);
3304 3304
3305 return err; 3305 return err;
3306} 3306}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/nvram.c b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
index 5c450d11dbc9..ff5b86733d5a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
@@ -19,7 +19,7 @@
19#include <linux/firmware.h> 19#include <linux/firmware.h>
20 20
21#include "dhd_dbg.h" 21#include "dhd_dbg.h"
22#include "nvram.h" 22#include "firmware.h"
23 23
24enum nvram_parser_state { 24enum nvram_parser_state {
25 IDLE, 25 IDLE,
@@ -187,7 +187,7 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
187 * and converts newlines to NULs. Shortens buffer as needed and pads with NULs. 187 * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
188 * End of buffer is completed with token identifying length of buffer. 188 * End of buffer is completed with token identifying length of buffer.
189 */ 189 */
190void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length) 190void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length)
191{ 191{
192 struct nvram_parser nvp; 192 struct nvram_parser nvp;
193 u32 pad; 193 u32 pad;
@@ -219,7 +219,7 @@ void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length)
219 return nvp.nvram; 219 return nvp.nvram;
220} 220}
221 221
222void brcmf_nvram_free(void *nvram) 222void brcmf_fw_nvram_free(void *nvram)
223{ 223{
224 kfree(nvram); 224 kfree(nvram);
225} 225}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/nvram.h b/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
index d454580928c9..127633bc242d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/nvram.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
@@ -13,12 +13,12 @@
13 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 13 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16#ifndef BRCMFMAC_NVRAM_H 16#ifndef BRCMFMAC_FIRMWARE_H
17#define BRCMFMAC_NVRAM_H 17#define BRCMFMAC_FIRMWARE_H
18 18
19 19
20void *brcmf_nvram_strip(const struct firmware *nv, u32 *new_length); 20void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length);
21void brcmf_nvram_free(void *nvram); 21void brcmf_fw_nvram_free(void *nvram);
22 22
23 23
24#endif /* BRCMFMAC_NVRAM_H */ 24#endif /* BRCMFMAC_FIRMWARE_H */