[PATCH 0/5] Remove useless inline functions from net

[PATCH 0/5] Remove useless inline functions from net

[Gaosheng Cui]

This series contains a few cleanup patches, to remove unused
inline functions who's caller have been removed. Thanks!

Gaosheng Cui (5):
  mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()
  mt76: Remove unused inline function mt76_wcid_mask_test()
  neighbour: Remove unused inline function neigh_key_eq16()
  net: Remove unused inline function sk_nulls_node_init()
  net: Remove unused inline function dst_hold_and_use()

 drivers/net/ethernet/mellanox/mlxsw/reg.h | 16 ----------------
 drivers/net/wireless/mediatek/mt76/util.h |  6 ------
 include/net/dst.h                         |  6 ------
 include/net/neighbour.h                   |  5 -----
 include/net/sock.h                        |  5 -----
 5 files changed, 38 deletions(-)

-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 1/5] mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()

[Gaosheng Cui]

All uses of mlxsw_reg_sftr2_pack() have
been removed since commit 77b7f83d5c25 ("mlxsw: Enable unified
bridge model"), so remove it.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 drivers/net/ethernet/mellanox/mlxsw/reg.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index d71d7f9a20f1..e188497c1b3e 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -2272,22 +2272,6 @@ MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port, 0x20, 0x80, 1);
  */
 MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port_mask, 0xA0, 0x80, 1);
 
-static inline void mlxsw_reg_sftr2_pack(char *payload,
-					unsigned int flood_table,
-					unsigned int index,
-					enum mlxsw_flood_table_type table_type,
-					unsigned int range, u16 port, bool set)
-{
-	MLXSW_REG_ZERO(sftr2, payload);
-	mlxsw_reg_sftr2_swid_set(payload, 0);
-	mlxsw_reg_sftr2_flood_table_set(payload, flood_table);
-	mlxsw_reg_sftr2_index_set(payload, index);
-	mlxsw_reg_sftr2_table_type_set(payload, table_type);
-	mlxsw_reg_sftr2_range_set(payload, range);
-	mlxsw_reg_sftr2_port_set(payload, port, set);
-	mlxsw_reg_sftr2_port_mask_set(payload, port, 1);
-}
-
 /* SMID-V2 - Switch Multicast ID Version 2 Register
  * ------------------------------------------------
  * The MID record maps from a MID (Multicast ID), which is a unique identifier
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/5] mt76: Remove unused inline function mt76_wcid_mask_test()

[Gaosheng Cui]

All uses of mt76_wcid_mask_test() have
been removed since commit 8950a62f19c9 ("mt76: get rid of
mt76_wcid_hw routine"), so remove it.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 drivers/net/wireless/mediatek/mt76/util.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/util.h b/drivers/net/wireless/mediatek/mt76/util.h
index 49c52d781f40..260965dde94c 100644
--- a/drivers/net/wireless/mediatek/mt76/util.h
+++ b/drivers/net/wireless/mediatek/mt76/util.h
@@ -29,12 +29,6 @@ enum {
 
 int mt76_wcid_alloc(u32 *mask, int size);
 
-static inline bool
-mt76_wcid_mask_test(u32 *mask, int idx)
-{
-	return mask[idx / 32] & BIT(idx % 32);
-}
-
 static inline void
 mt76_wcid_mask_set(u32 *mask, int idx)
 {
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/5] neighbour: Remove unused inline function neigh_key_eq16()

[Gaosheng Cui]

All uses of neigh_key_eq16() have
been removed since commit 1202cdd66531 ("Remove DECnet support
from kernel"), so remove it.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 include/net/neighbour.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 3827a6b395fd..20745cf7ae1a 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -276,11 +276,6 @@ static inline void *neighbour_priv(const struct neighbour *n)
 
 extern const struct nla_policy nda_policy[];
 
-static inline bool neigh_key_eq16(const struct neighbour *n, const void *pkey)
-{
-	return *(const u16 *)n->primary_key == *(const u16 *)pkey;
-}
-
 static inline bool neigh_key_eq32(const struct neighbour *n, const void *pkey)
 {
 	return *(const u32 *)n->primary_key == *(const u32 *)pkey;
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 4/5] net: Remove unused inline function sk_nulls_node_init()

[Gaosheng Cui]

All uses of sk_nulls_node_init() have
been removed since commit dbca1596bbb0 ("ping: convert to RCU
lookups, get rid of rwlock"), so remove it.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 include/net/sock.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 96a31026e35d..08038a385ef2 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -744,11 +744,6 @@ static inline void sk_node_init(struct hlist_node *node)
 	node->pprev = NULL;
 }
 
-static inline void sk_nulls_node_init(struct hlist_nulls_node *node)
-{
-	node->pprev = NULL;
-}
-
 static inline void __sk_del_node(struct sock *sk)
 {
 	__hlist_del(&sk->sk_node);
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 5/5] net: Remove unused inline function dst_hold_and_use()

[Gaosheng Cui]

All uses of dst_hold_and_use() have
been removed since commit 1202cdd66531 ("Remove DECnet support
from kernel"), so remove it.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 include/net/dst.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/net/dst.h b/include/net/dst.h
index 6aa252c3fc55..00b479ce6b99 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -239,12 +239,6 @@ static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
 	}
 }
 
-static inline void dst_hold_and_use(struct dst_entry *dst, unsigned long time)
-{
-	dst_hold(dst);
-	dst_use_noref(dst, time);
-}
-
 static inline struct dst_entry *dst_clone(struct dst_entry *dst)
 {
 	if (dst)
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/5] mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()

[Ido Schimmel]

On Wed, Sep 21, 2022 at 05:04:51PM +0800, Gaosheng Cui wrote:
> All uses of mlxsw_reg_sftr2_pack() have
> been removed since commit 77b7f83d5c25 ("mlxsw: Enable unified
> bridge model"), so remove it.

Please rather remove the entire register in v2 [1].

Subject prefix should be "PATCH net-next":
https://docs.kernel.org/process/maintainer-netdev.html#how-do-i-indicate-which-tree-net-vs-net-next-my-patch-should-be-in

Thanks

[1]
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index b293a154e49f..1cc117c8f230 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -2251,76 +2251,6 @@ static inline void mlxsw_reg_smpe_pack(char *payload, u16 local_port,
 	mlxsw_reg_smpe_evid_set(payload, evid);
 }
 
-/* SFTR-V2 - Switch Flooding Table Version 2 Register
- * --------------------------------------------------
- * The switch flooding table is used for flooding packet replication. The table
- * defines a bit mask of ports for packet replication.
- */
-#define MLXSW_REG_SFTR2_ID 0x202F
-#define MLXSW_REG_SFTR2_LEN 0x120
-
-MLXSW_REG_DEFINE(sftr2, MLXSW_REG_SFTR2_ID, MLXSW_REG_SFTR2_LEN);
-
-/* reg_sftr2_swid
- * Switch partition ID with which to associate the port.
- * Access: Index
- */
-MLXSW_ITEM32(reg, sftr2, swid, 0x00, 24, 8);
-
-/* reg_sftr2_flood_table
- * Flooding table index to associate with the specific type on the specific
- * switch partition.
- * Access: Index
- */
-MLXSW_ITEM32(reg, sftr2, flood_table, 0x00, 16, 6);
-
-/* reg_sftr2_index
- * Index. Used as an index into the Flooding Table in case the table is
- * configured to use VID / FID or FID Offset.
- * Access: Index
- */
-MLXSW_ITEM32(reg, sftr2, index, 0x00, 0, 16);
-
-/* reg_sftr2_table_type
- * See mlxsw_flood_table_type
- * Access: RW
- */
-MLXSW_ITEM32(reg, sftr2, table_type, 0x04, 16, 3);
-
-/* reg_sftr2_range
- * Range of entries to update
- * Access: Index
- */
-MLXSW_ITEM32(reg, sftr2, range, 0x04, 0, 16);
-
-/* reg_sftr2_port
- * Local port membership (1 bit per port).
- * Access: RW
- */
-MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port, 0x20, 0x80, 1);
-
-/* reg_sftr2_port_mask
- * Local port mask (1 bit per port).
- * Access: WO
- */
-MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port_mask, 0xA0, 0x80, 1);
-
-static inline void mlxsw_reg_sftr2_pack(char *payload,
-					unsigned int flood_table,
-					unsigned int index,
-					enum mlxsw_flood_table_type table_type,
-					unsigned int range, u16 port, bool set)
-{
-	MLXSW_REG_ZERO(sftr2, payload);
-	mlxsw_reg_sftr2_swid_set(payload, 0);
-	mlxsw_reg_sftr2_flood_table_set(payload, flood_table);
-	mlxsw_reg_sftr2_index_set(payload, index);
-	mlxsw_reg_sftr2_table_type_set(payload, table_type);
-	mlxsw_reg_sftr2_range_set(payload, range);
-	mlxsw_reg_sftr2_port_set(payload, port, set);
-	mlxsw_reg_sftr2_port_mask_set(payload, port, 1);
-}
-
 /* SMID-V2 - Switch Multicast ID Version 2 Register
  * ------------------------------------------------
  * The MID record maps from a MID (Multicast ID), which is a unique identifier
@@ -12876,7 +12806,6 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {
 	MLXSW_REG(spvc),
 	MLXSW_REG(spevet),
 	MLXSW_REG(smpe),
-	MLXSW_REG(sftr2),
 	MLXSW_REG(smid2),
 	MLXSW_REG(cwtp),
 	MLXSW_REG(cwtpm),

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/5] mt76: Remove unused inline function mt76_wcid_mask_test()

[Jakub Kicinski]

On Wed, 21 Sep 2022 17:04:52 +0800 Gaosheng Cui wrote:
> All uses of mt76_wcid_mask_test() have
> been removed since commit 8950a62f19c9 ("mt76: get rid of
> mt76_wcid_hw routine"), so remove it.

This should go via the wireless tree, please take it out of this series
and send it to linux-wireless separately.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/5] mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()

[Petr Machata]

Gaosheng Cui <cuigaosheng1@huawei.com> writes:

> All uses of mlxsw_reg_sftr2_pack() have
> been removed since commit 77b7f83d5c25 ("mlxsw: Enable unified
> bridge model"), so remove it.
>
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>

Reviewed-by: Petr Machata <petrm@nvidia.com>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/5] mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()

[Petr Machata]

Petr Machata <petrm@nvidia.com> writes:

> Gaosheng Cui <cuigaosheng1@huawei.com> writes:
>
>> All uses of mlxsw_reg_sftr2_pack() have
>> been removed since commit 77b7f83d5c25 ("mlxsw: Enable unified
>> bridge model"), so remove it.
>>
>> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
>
> Reviewed-by: Petr Machata <petrm@nvidia.com>

I missed Ido's reply.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/5] mt76: Remove unused inline function mt76_wcid_mask_test()

[Jeff Johnson]

On 9/21/2022 6:11 AM, Jakub Kicinski wrote:
> On Wed, 21 Sep 2022 17:04:52 +0800 Gaosheng Cui wrote:
>> All uses of mt76_wcid_mask_test() have
>> been removed since commit 8950a62f19c9 ("mt76: get rid of
>> mt76_wcid_hw routine"), so remove it.
> 
> This should go via the wireless tree, please take it out of this series
> and send it to linux-wireless separately.

And when you do that add wifi: prefix to the subject

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/5] mt76: Remove unused inline function mt76_wcid_mask_test()

[cuigaosheng]

> On 9/21/2022 6:11 AM, Jakub Kicinski wrote:
>> On Wed, 21 Sep 2022 17:04:52 +0800 Gaosheng Cui wrote:
>>> All uses of mt76_wcid_mask_test() have
>>> been removed since commit 8950a62f19c9 ("mt76: get rid of
>>> mt76_wcid_hw routine"), so remove it.
>>
>> This should go via the wireless tree, please take it out of this series
>> and send it to linux-wireless separately.
>
> And when you do that add wifi: prefix to the subject
> .

Thanks for taking time to review this patch, I have made a patch v2 and 
submitted it.

link: 
https://lore.kernel.org/netdev/20220922074711.1408385-1-cuigaosheng1@huawei.com/



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/5] mlxsw: reg: Remove unused inline function mlxsw_reg_sftr2_pack()

[cuigaosheng]

> Please rather remove the entire register in v2 [1].
>
> Subject prefix should be "PATCH net-next":
> https://docs.kernel.org/process/maintainer-netdev.html#how-do-i-indicate-which-tree-net-vs-net-next-my-patch-should-be-in
>
> Thanks

Thanks for taking the time to review this patch, I have made a patch v2 and submitted it.

Link: https://patchwork.kernel.org/project/netdevbpf/list/?series=679311

> On Wed, Sep 21, 2022 at 05:04:51PM +0800, Gaosheng Cui wrote:
>> All uses of mlxsw_reg_sftr2_pack() have
>> been removed since commit 77b7f83d5c25 ("mlxsw: Enable unified
>> bridge model"), so remove it.
> Please rather remove the entire register in v2 [1].
>
> Subject prefix should be "PATCH net-next":
> https://docs.kernel.org/process/maintainer-netdev.html#how-do-i-indicate-which-tree-net-vs-net-next-my-patch-should-be-in
>
> Thanks
>
> [1]
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
> index b293a154e49f..1cc117c8f230 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
> +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
> @@ -2251,76 +2251,6 @@ static inline void mlxsw_reg_smpe_pack(char *payload, u16 local_port,
>   	mlxsw_reg_smpe_evid_set(payload, evid);
>   }
>   
> -/* SFTR-V2 - Switch Flooding Table Version 2 Register
> - * --------------------------------------------------
> - * The switch flooding table is used for flooding packet replication. The table
> - * defines a bit mask of ports for packet replication.
> - */
> -#define MLXSW_REG_SFTR2_ID 0x202F
> -#define MLXSW_REG_SFTR2_LEN 0x120
> -
> -MLXSW_REG_DEFINE(sftr2, MLXSW_REG_SFTR2_ID, MLXSW_REG_SFTR2_LEN);
> -
> -/* reg_sftr2_swid
> - * Switch partition ID with which to associate the port.
> - * Access: Index
> - */
> -MLXSW_ITEM32(reg, sftr2, swid, 0x00, 24, 8);
> -
> -/* reg_sftr2_flood_table
> - * Flooding table index to associate with the specific type on the specific
> - * switch partition.
> - * Access: Index
> - */
> -MLXSW_ITEM32(reg, sftr2, flood_table, 0x00, 16, 6);
> -
> -/* reg_sftr2_index
> - * Index. Used as an index into the Flooding Table in case the table is
> - * configured to use VID / FID or FID Offset.
> - * Access: Index
> - */
> -MLXSW_ITEM32(reg, sftr2, index, 0x00, 0, 16);
> -
> -/* reg_sftr2_table_type
> - * See mlxsw_flood_table_type
> - * Access: RW
> - */
> -MLXSW_ITEM32(reg, sftr2, table_type, 0x04, 16, 3);
> -
> -/* reg_sftr2_range
> - * Range of entries to update
> - * Access: Index
> - */
> -MLXSW_ITEM32(reg, sftr2, range, 0x04, 0, 16);
> -
> -/* reg_sftr2_port
> - * Local port membership (1 bit per port).
> - * Access: RW
> - */
> -MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port, 0x20, 0x80, 1);
> -
> -/* reg_sftr2_port_mask
> - * Local port mask (1 bit per port).
> - * Access: WO
> - */
> -MLXSW_ITEM_BIT_ARRAY(reg, sftr2, port_mask, 0xA0, 0x80, 1);
> -
> -static inline void mlxsw_reg_sftr2_pack(char *payload,
> -					unsigned int flood_table,
> -					unsigned int index,
> -					enum mlxsw_flood_table_type table_type,
> -					unsigned int range, u16 port, bool set)
> -{
> -	MLXSW_REG_ZERO(sftr2, payload);
> -	mlxsw_reg_sftr2_swid_set(payload, 0);
> -	mlxsw_reg_sftr2_flood_table_set(payload, flood_table);
> -	mlxsw_reg_sftr2_index_set(payload, index);
> -	mlxsw_reg_sftr2_table_type_set(payload, table_type);
> -	mlxsw_reg_sftr2_range_set(payload, range);
> -	mlxsw_reg_sftr2_port_set(payload, port, set);
> -	mlxsw_reg_sftr2_port_mask_set(payload, port, 1);
> -}
> -
>   /* SMID-V2 - Switch Multicast ID Version 2 Register
>    * ------------------------------------------------
>    * The MID record maps from a MID (Multicast ID), which is a unique identifier
> @@ -12876,7 +12806,6 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {
>   	MLXSW_REG(spvc),
>   	MLXSW_REG(spevet),
>   	MLXSW_REG(smpe),
> -	MLXSW_REG(sftr2),
>   	MLXSW_REG(smid2),
>   	MLXSW_REG(cwtp),
>   	MLXSW_REG(cwtpm),
> .

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel