You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
216 lines
8.8 KiB
Diff
216 lines
8.8 KiB
Diff
From 540d5a24c9b0c9a14dce5b59167628b9f18c27cd Mon Sep 17 00:00:00 2001
|
|
From: Hector Martin <marcan@marcan.st>
|
|
Date: Sun, 26 Dec 2021 00:24:02 +0900
|
|
Subject: [PATCH 31/34] brcmfmac: fwil: Constify iovar name arguments
|
|
|
|
Make all the iovar name arguments const char * instead of just char *.
|
|
|
|
Signed-off-by: Hector Martin <marcan@marcan.st>
|
|
---
|
|
.../broadcom/brcm80211/brcmfmac/fwil.c | 34 +++++++++----------
|
|
.../broadcom/brcm80211/brcmfmac/fwil.h | 28 +++++++--------
|
|
2 files changed, 31 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
|
|
index d5578ca68..72fe8bce6 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
|
|
@@ -192,7 +192,7 @@ brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data)
|
|
}
|
|
|
|
static u32
|
|
-brcmf_create_iovar(char *name, const char *data, u32 datalen,
|
|
+brcmf_create_iovar(const char *name, const char *data, u32 datalen,
|
|
char *buf, u32 buflen)
|
|
{
|
|
u32 len;
|
|
@@ -213,7 +213,7 @@ brcmf_create_iovar(char *name, const char *data, u32 datalen,
|
|
|
|
|
|
s32
|
|
-brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,
|
|
+brcmf_fil_iovar_data_set(struct brcmf_if *ifp, const char *name, const void *data,
|
|
u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -241,7 +241,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
|
|
+brcmf_fil_iovar_data_get(struct brcmf_if *ifp, const char *name, void *data,
|
|
u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -272,7 +272,7 @@ brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_iovar_int_set(struct brcmf_if *ifp, char *name, u32 data)
|
|
+brcmf_fil_iovar_int_set(struct brcmf_if *ifp, const char *name, u32 data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(data);
|
|
|
|
@@ -280,7 +280,7 @@ brcmf_fil_iovar_int_set(struct brcmf_if *ifp, char *name, u32 data)
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_iovar_int_get(struct brcmf_if *ifp, char *name, u32 *data)
|
|
+brcmf_fil_iovar_int_get(struct brcmf_if *ifp, const char *name, u32 *data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(*data);
|
|
s32 err;
|
|
@@ -292,7 +292,7 @@ brcmf_fil_iovar_int_get(struct brcmf_if *ifp, char *name, u32 *data)
|
|
}
|
|
|
|
static u32
|
|
-brcmf_create_bsscfg(s32 bsscfgidx, char *name, char *data, u32 datalen,
|
|
+brcmf_create_bsscfg(s32 bsscfgidx, const char *name, char *data, u32 datalen,
|
|
char *buf, u32 buflen)
|
|
{
|
|
const s8 *prefix = "bsscfg:";
|
|
@@ -337,7 +337,7 @@ brcmf_create_bsscfg(s32 bsscfgidx, char *name, char *data, u32 datalen,
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,
|
|
+brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, const char *name,
|
|
void *data, u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -366,7 +366,7 @@ brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name,
|
|
+brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, const char *name,
|
|
void *data, u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -396,7 +396,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name,
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, char *name, u32 data)
|
|
+brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, const char *name, u32 data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(data);
|
|
|
|
@@ -405,7 +405,7 @@ brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, char *name, u32 data)
|
|
}
|
|
|
|
s32
|
|
-brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, char *name, u32 *data)
|
|
+brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, const char *name, u32 *data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(*data);
|
|
s32 err;
|
|
@@ -417,7 +417,7 @@ brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, char *name, u32 *data)
|
|
return err;
|
|
}
|
|
|
|
-static u32 brcmf_create_xtlv(char *name, u16 id, char *data, u32 len,
|
|
+static u32 brcmf_create_xtlv(const char *name, u16 id, char *data, u32 len,
|
|
char *buf, u32 buflen)
|
|
{
|
|
u32 iolen;
|
|
@@ -438,7 +438,7 @@ static u32 brcmf_create_xtlv(char *name, u16 id, char *data, u32 len,
|
|
return iolen;
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, char *name, u16 id,
|
|
+s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, const char *name, u16 id,
|
|
void *data, u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -466,7 +466,7 @@ s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, char *name, u16 id,
|
|
return err;
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, char *name, u16 id,
|
|
+s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, const char *name, u16 id,
|
|
void *data, u32 len)
|
|
{
|
|
struct brcmf_pub *drvr = ifp->drvr;
|
|
@@ -495,7 +495,7 @@ s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, char *name, u16 id,
|
|
return err;
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, char *name, u16 id, u32 data)
|
|
+s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, const char *name, u16 id, u32 data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(data);
|
|
|
|
@@ -503,7 +503,7 @@ s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, char *name, u16 id, u32 data)
|
|
sizeof(data_le));
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, char *name, u16 id, u32 *data)
|
|
+s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, const char *name, u16 id, u32 *data)
|
|
{
|
|
__le32 data_le = cpu_to_le32(*data);
|
|
s32 err;
|
|
@@ -514,12 +514,12 @@ s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, char *name, u16 id, u32 *data)
|
|
return err;
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_int8_get(struct brcmf_if *ifp, char *name, u16 id, u8 *data)
|
|
+s32 brcmf_fil_xtlv_int8_get(struct brcmf_if *ifp, const char *name, u16 id, u8 *data)
|
|
{
|
|
return brcmf_fil_xtlv_data_get(ifp, name, id, data, sizeof(*data));
|
|
}
|
|
|
|
-s32 brcmf_fil_xtlv_int16_get(struct brcmf_if *ifp, char *name, u16 id, u16 *data)
|
|
+s32 brcmf_fil_xtlv_int16_get(struct brcmf_if *ifp, const char *name, u16 id, u16 *data)
|
|
{
|
|
__le16 data_le = cpu_to_le16(*data);
|
|
s32 err;
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h
|
|
index cb26f8c59..bc693157c 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h
|
|
@@ -84,26 +84,26 @@ s32 brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len);
|
|
s32 brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data);
|
|
s32 brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data);
|
|
|
|
-s32 brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, const void *data,
|
|
+s32 brcmf_fil_iovar_data_set(struct brcmf_if *ifp, const char *name, const void *data,
|
|
u32 len);
|
|
-s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,
|
|
+s32 brcmf_fil_iovar_data_get(struct brcmf_if *ifp, const char *name, void *data,
|
|
u32 len);
|
|
-s32 brcmf_fil_iovar_int_set(struct brcmf_if *ifp, char *name, u32 data);
|
|
-s32 brcmf_fil_iovar_int_get(struct brcmf_if *ifp, char *name, u32 *data);
|
|
+s32 brcmf_fil_iovar_int_set(struct brcmf_if *ifp, const char *name, u32 data);
|
|
+s32 brcmf_fil_iovar_int_get(struct brcmf_if *ifp, const char *name, u32 *data);
|
|
|
|
-s32 brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name, void *data,
|
|
+s32 brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, const char *name, void *data,
|
|
u32 len);
|
|
-s32 brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name, void *data,
|
|
+s32 brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, const char *name, void *data,
|
|
u32 len);
|
|
-s32 brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, char *name, u32 data);
|
|
-s32 brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, char *name, u32 *data);
|
|
-s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, char *name, u16 id,
|
|
+s32 brcmf_fil_bsscfg_int_set(struct brcmf_if *ifp, const char *name, u32 data);
|
|
+s32 brcmf_fil_bsscfg_int_get(struct brcmf_if *ifp, const char *name, u32 *data);
|
|
+s32 brcmf_fil_xtlv_data_set(struct brcmf_if *ifp, const char *name, u16 id,
|
|
void *data, u32 len);
|
|
-s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, char *name, u16 id,
|
|
+s32 brcmf_fil_xtlv_data_get(struct brcmf_if *ifp, const char *name, u16 id,
|
|
void *data, u32 len);
|
|
-s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, char *name, u16 id, u32 data);
|
|
-s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, char *name, u16 id, u32 *data);
|
|
-s32 brcmf_fil_xtlv_int8_get(struct brcmf_if *ifp, char *name, u16 id, u8 *data);
|
|
-s32 brcmf_fil_xtlv_int16_get(struct brcmf_if *ifp, char *name, u16 id, u16 *data);
|
|
+s32 brcmf_fil_xtlv_int_set(struct brcmf_if *ifp, const char *name, u16 id, u32 data);
|
|
+s32 brcmf_fil_xtlv_int_get(struct brcmf_if *ifp, const char *name, u16 id, u32 *data);
|
|
+s32 brcmf_fil_xtlv_int8_get(struct brcmf_if *ifp, const char *name, u16 id, u8 *data);
|
|
+s32 brcmf_fil_xtlv_int16_get(struct brcmf_if *ifp, const char *name, u16 id, u16 *data);
|
|
|
|
#endif /* _fwil_h_ */
|
|
--
|
|
2.34.1
|
|
|