Skip to content

L
linux
Commit 412791df authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files
Options

mlxsw: item: Make char *buf arg constant for getters 

Enforce const for getter buf args.
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe0612dc
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 19 deletions
drivers/net/ethernet/mellanox/mlxsw/item.h
View file @ 412791df
...@@ -72,7 +72,8 @@ __mlxsw_item_offset(const struct mlxsw_item *item, unsigned short index, ...@@ -72,7 +72,8 @@ __mlxsw_item_offset(const struct mlxsw_item *item, unsigned short index,
typesize); typesize);
} }
static inline u16 __mlxsw_item_get16(char *buf, const struct mlxsw_item *item, static inline u16 __mlxsw_item_get16(const char *buf,
const struct mlxsw_item *item,
unsigned short index) unsigned short index)
{ {
unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u16)); unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u16));
...@@ -105,7 +106,8 @@ static inline void __mlxsw_item_set16(char *buf, const struct mlxsw_item *item, ...@@ -105,7 +106,8 @@ static inline void __mlxsw_item_set16(char *buf, const struct mlxsw_item *item,
b[offset] = cpu_to_be16(tmp); b[offset] = cpu_to_be16(tmp);
} }
static inline u32 __mlxsw_item_get32(char *buf, const struct mlxsw_item *item, static inline u32 __mlxsw_item_get32(const char *buf,
const struct mlxsw_item *item,
unsigned short index) unsigned short index)
{ {
unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u32)); unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u32));
...@@ -138,7 +140,8 @@ static inline void __mlxsw_item_set32(char *buf, const struct mlxsw_item *item, ...@@ -138,7 +140,8 @@ static inline void __mlxsw_item_set32(char *buf, const struct mlxsw_item *item,
b[offset] = cpu_to_be32(tmp); b[offset] = cpu_to_be32(tmp);
} }
static inline u64 __mlxsw_item_get64(char *buf, const struct mlxsw_item *item, static inline u64 __mlxsw_item_get64(const char *buf,
const struct mlxsw_item *item,
unsigned short index) unsigned short index)
{ {
unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u64)); unsigned int offset = __mlxsw_item_offset(item, index, sizeof(u64));
...@@ -170,7 +173,7 @@ static inline void __mlxsw_item_set64(char *buf, const struct mlxsw_item *item, ...@@ -170,7 +173,7 @@ static inline void __mlxsw_item_set64(char *buf, const struct mlxsw_item *item,
b[offset] = cpu_to_be64(tmp); b[offset] = cpu_to_be64(tmp);
} }
static inline void __mlxsw_item_memcpy_from(char *buf, char *dst, static inline void __mlxsw_item_memcpy_from(const char *buf, char *dst,
const struct mlxsw_item *item, const struct mlxsw_item *item,
unsigned short index) unsigned short index)
{ {
...@@ -213,7 +216,7 @@ __mlxsw_item_bit_array_offset(const struct mlxsw_item *item, ...@@ -213,7 +216,7 @@ __mlxsw_item_bit_array_offset(const struct mlxsw_item *item,
return item->offset + offset; return item->offset + offset;
} }
static inline u8 __mlxsw_item_bit_array_get(char *buf, static inline u8 __mlxsw_item_bit_array_get(const char *buf,
const struct mlxsw_item *item, const struct mlxsw_item *item,
u16 index) u16 index)
{ {
...@@ -257,7 +260,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -257,7 +260,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.size = {.bits = _sizebits,}, \ .size = {.bits = _sizebits,}, \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u16 mlxsw_##_type##_##_cname##_##_iname##_get(char *buf) \ static inline u16 mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf) \
{ \ { \
return __mlxsw_item_get16(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \ return __mlxsw_item_get16(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \
} \ } \
...@@ -278,7 +281,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -278,7 +281,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u16 \ static inline u16 \
mlxsw_##_type##_##_cname##_##_iname##_get(char *buf, unsigned short index) \ mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf, unsigned short index)\
{ \ { \
return __mlxsw_item_get16(buf, &__ITEM_NAME(_type, _cname, _iname), \ return __mlxsw_item_get16(buf, &__ITEM_NAME(_type, _cname, _iname), \
index); \ index); \
...@@ -298,7 +301,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -298,7 +301,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.size = {.bits = _sizebits,}, \ .size = {.bits = _sizebits,}, \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u32 mlxsw_##_type##_##_cname##_##_iname##_get(char *buf) \ static inline u32 mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf) \
{ \ { \
return __mlxsw_item_get32(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \ return __mlxsw_item_get32(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \
} \ } \
...@@ -319,7 +322,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -319,7 +322,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u32 \ static inline u32 \
mlxsw_##_type##_##_cname##_##_iname##_get(char *buf, unsigned short index) \ mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf, unsigned short index)\
{ \ { \
return __mlxsw_item_get32(buf, &__ITEM_NAME(_type, _cname, _iname), \ return __mlxsw_item_get32(buf, &__ITEM_NAME(_type, _cname, _iname), \
index); \ index); \
...@@ -339,7 +342,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -339,7 +342,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.size = {.bits = _sizebits,}, \ .size = {.bits = _sizebits,}, \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u64 mlxsw_##_type##_##_cname##_##_iname##_get(char *buf) \ static inline u64 mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf) \
{ \ { \
return __mlxsw_item_get64(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \ return __mlxsw_item_get64(buf, &__ITEM_NAME(_type, _cname, _iname), 0); \
} \ } \
...@@ -360,7 +363,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -360,7 +363,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u64 \ static inline u64 \
mlxsw_##_type##_##_cname##_##_iname##_get(char *buf, unsigned short index) \ mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf, unsigned short index)\
{ \ { \
return __mlxsw_item_get64(buf, &__ITEM_NAME(_type, _cname, _iname), \ return __mlxsw_item_get64(buf, &__ITEM_NAME(_type, _cname, _iname), \
index); \ index); \
...@@ -380,7 +383,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -380,7 +383,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline void \ static inline void \
mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(char *buf, char *dst) \ mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(const char *buf, char *dst) \
{ \ { \
__mlxsw_item_memcpy_from(buf, dst, \ __mlxsw_item_memcpy_from(buf, dst, \
&__ITEM_NAME(_type, _cname, _iname), 0); \ &__ITEM_NAME(_type, _cname, _iname), 0); \
...@@ -402,7 +405,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -402,7 +405,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline void \ static inline void \
mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(char *buf, \ mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(const char *buf, \
unsigned short index, \ unsigned short index, \
char *dst) \ char *dst) \
{ \ { \
...@@ -427,7 +430,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ ...@@ -427,7 +430,7 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \
.name = #_type "_" #_cname "_" #_iname, \ .name = #_type "_" #_cname "_" #_iname, \
}; \ }; \
static inline u8 \ static inline u8 \
mlxsw_##_type##_##_cname##_##_iname##_get(char *buf, u16 index) \ mlxsw_##_type##_##_cname##_##_iname##_get(const char *buf, u16 index) \
{ \ { \
return __mlxsw_item_bit_array_get(buf, \ return __mlxsw_item_bit_array_get(buf, \
&__ITEM_NAME(_type, _cname, _iname), \ &__ITEM_NAME(_type, _cname, _iname), \
......
drivers/net/ethernet/mellanox/mlxsw/pci.c
View file @ 412791df
...@@ -238,8 +238,9 @@ static bool mlxsw_pci_elem_hw_owned(struct mlxsw_pci_queue *q, bool owner_bit) ...@@ -238,8 +238,9 @@ static bool mlxsw_pci_elem_hw_owned(struct mlxsw_pci_queue *q, bool owner_bit)
return owner_bit != !!(q->consumer_counter & q->count); return owner_bit != !!(q->consumer_counter & q->count);
} }
static char *mlxsw_pci_queue_sw_elem_get(struct mlxsw_pci_queue *q, static char *
u32 (*get_elem_owner_func)(char *)) mlxsw_pci_queue_sw_elem_get(struct mlxsw_pci_queue *q,
u32 (*get_elem_owner_func)(const char *))
{ {
struct mlxsw_pci_queue_elem_info *elem_info; struct mlxsw_pci_queue_elem_info *elem_info;
char *elem; char *elem;
......
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
View file @ 412791df
...@@ -1413,7 +1413,7 @@ static int mlxsw_sp_port_set_pauseparam(struct net_device *dev, ...@@ -1413,7 +1413,7 @@ static int mlxsw_sp_port_set_pauseparam(struct net_device *dev,
struct mlxsw_sp_port_hw_stats { struct mlxsw_sp_port_hw_stats {
char str[ETH_GSTRING_LEN]; char str[ETH_GSTRING_LEN];
u64 (*getter)(char *payload); u64 (*getter)(const char *payload);
}; };
static struct mlxsw_sp_port_hw_stats mlxsw_sp_port_hw_stats[] = { static struct mlxsw_sp_port_hw_stats mlxsw_sp_port_hw_stats[] = {
...@@ -1534,7 +1534,7 @@ static struct mlxsw_sp_port_hw_stats mlxsw_sp_port_hw_prio_stats[] = { ...@@ -1534,7 +1534,7 @@ static struct mlxsw_sp_port_hw_stats mlxsw_sp_port_hw_prio_stats[] = {
#define MLXSW_SP_PORT_HW_PRIO_STATS_LEN ARRAY_SIZE(mlxsw_sp_port_hw_prio_stats) #define MLXSW_SP_PORT_HW_PRIO_STATS_LEN ARRAY_SIZE(mlxsw_sp_port_hw_prio_stats)
static u64 mlxsw_reg_ppcnt_tc_transmit_queue_bytes_get(char *ppcnt_pl) static u64 mlxsw_reg_ppcnt_tc_transmit_queue_bytes_get(const char *ppcnt_pl)
{ {
u64 transmit_queue = mlxsw_reg_ppcnt_tc_transmit_queue_get(ppcnt_pl); u64 transmit_queue = mlxsw_reg_ppcnt_tc_transmit_queue_get(ppcnt_pl);
......
drivers/net/ethernet/mellanox/mlxsw/switchx2.c
View file @ 412791df
...@@ -410,7 +410,7 @@ static void mlxsw_sx_port_get_drvinfo(struct net_device *dev, ...@@ -410,7 +410,7 @@ static void mlxsw_sx_port_get_drvinfo(struct net_device *dev,
struct mlxsw_sx_port_hw_stats { struct mlxsw_sx_port_hw_stats {
char str[ETH_GSTRING_LEN]; char str[ETH_GSTRING_LEN];
u64 (*getter)(char *payload); u64 (*getter)(const char *payload);
}; };
static const struct mlxsw_sx_port_hw_stats mlxsw_sx_port_hw_stats[] = { static const struct mlxsw_sx_port_hw_stats mlxsw_sx_port_hw_stats[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7