| Message ID | 20250203185229.204279-1-linux@treblig.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2cf424f5ac01682c93e3decfddee6282b7552f50 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] mlx4: Remove unused functions | expand |
On 03/02/2025 20:52, linux@treblig.org wrote: > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > The last use of mlx4_find_cached_mac() was removed in 2014 by > commit 2f5bb473681b ("mlx4: Add ref counting to port MAC table for RoCE") > > mlx4_zone_free_entries() was added in 2014 by > commit 7a89399ffad7 ("net/mlx4: Add mlx4_bitmap zone allocator") > but hasn't been used. (The _unique version is used) > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > Reviewed-by: Simon Horman <horms@kernel.org> > --- > drivers/net/ethernet/mellanox/mlx4/alloc.c | 22 ---------------------- > drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 ------ > drivers/net/ethernet/mellanox/mlx4/port.c | 20 -------------------- > include/linux/mlx4/device.h | 1 - > 4 files changed, 49 deletions(-) > Thanks for your patch. Reviewed-by: Tariq Toukan <tariqt@nvidia.com> Tariq
On Tue, Feb 4, 2025 at 12:22 AM <linux@treblig.org> wrote: > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > The last use of mlx4_find_cached_mac() was removed in 2014 by > commit 2f5bb473681b ("mlx4: Add ref counting to port MAC table for RoCE") > > mlx4_zone_free_entries() was added in 2014 by > commit 7a89399ffad7 ("net/mlx4: Add mlx4_bitmap zone allocator") > but hasn't been used. (The _unique version is used) > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > Reviewed-by: Simon Horman <horms@kernel.org> LGTM, Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 3 Feb 2025 18:52:29 +0000 you wrote: > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > The last use of mlx4_find_cached_mac() was removed in 2014 by > commit 2f5bb473681b ("mlx4: Add ref counting to port MAC table for RoCE") > > mlx4_zone_free_entries() was added in 2014 by > commit 7a89399ffad7 ("net/mlx4: Add mlx4_bitmap zone allocator") > but hasn't been used. (The _unique version is used) > > [...] Here is the summary with links: - [net-next] mlx4: Remove unused functions https://git.kernel.org/netdev/net-next/c/2cf424f5ac01 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c index b330020dc0d6..598df63518c5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/alloc.c +++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c @@ -526,28 +526,6 @@ u32 mlx4_zone_alloc_entries(struct mlx4_zone_allocator *zones, u32 uid, int coun return res; } -u32 mlx4_zone_free_entries(struct mlx4_zone_allocator *zones, u32 uid, u32 obj, u32 count) -{ - struct mlx4_zone_entry *zone; - int res = 0; - - spin_lock(&zones->lock); - - zone = __mlx4_find_zone_by_uid(zones, uid); - - if (NULL == zone) { - res = -1; - goto out; - } - - __mlx4_free_from_zone(zone, obj, count); - -out: - spin_unlock(&zones->lock); - - return res; -} - u32 mlx4_zone_free_entries_unique(struct mlx4_zone_allocator *zones, u32 obj, u32 count) { struct mlx4_zone_entry *zone; diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index d7d856d1758a..b213094ea30f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h @@ -1478,12 +1478,6 @@ void mlx4_zone_allocator_destroy(struct mlx4_zone_allocator *zone_alloc); u32 mlx4_zone_alloc_entries(struct mlx4_zone_allocator *zones, u32 uid, int count, int align, u32 skip_mask, u32 *puid); -/* Free <count> objects, start from <obj> of the uid <uid> from zone_allocator - * <zones>. - */ -u32 mlx4_zone_free_entries(struct mlx4_zone_allocator *zones, - u32 uid, u32 obj, u32 count); - /* If <zones> was allocated with MLX4_ZONE_ALLOC_FLAGS_NO_OVERLAP, instead of * specifying the uid when freeing an object, zone allocator could figure it by * itself. Other parameters are similar to mlx4_zone_free. diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c index 4e43f4a7d246..e3d0b13c1610 100644 --- a/drivers/net/ethernet/mellanox/mlx4/port.c +++ b/drivers/net/ethernet/mellanox/mlx4/port.c @@ -147,26 +147,6 @@ static int mlx4_set_port_mac_table(struct mlx4_dev *dev, u8 port, return err; } -int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx) -{ - struct mlx4_port_info *info = &mlx4_priv(dev)->port[port]; - struct mlx4_mac_table *table = &info->mac_table; - int i; - - for (i = 0; i < MLX4_MAX_MAC_NUM; i++) { - if (!table->refs[i]) - continue; - - if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) { - *idx = i; - return 0; - } - } - - return -ENOENT; -} -EXPORT_SYMBOL_GPL(mlx4_find_cached_mac); - static bool mlx4_need_mf_bond(struct mlx4_dev *dev) { int i, num_eth_ports = 0; diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 27f42f713c89..87edb7a8173b 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -1415,7 +1415,6 @@ int mlx4_get_is_vlan_offload_disabled(struct mlx4_dev *dev, u8 port, bool *vlan_offload_disabled); void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl, struct _rule_hw *eth_header); -int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx); int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx); int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index); void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);