Commit bd3e86a5 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_buffers: Inline mlxsw_sp_sb_max_headroom_cells() 



This function is now only used from the buffers module, and is a trivial
field reference. Just inline it and drop the related artifacts.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c22f29f

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+0 −1
Original line number Diff line number Diff line
@@ -504,7 +504,6 @@ int mlxsw_sp_sb_occ_tc_port_bind_get(struct mlxsw_core_port *mlxsw_core_port, 
				     u32 *p_cur, u32 *p_max);

u32 mlxsw_sp_cells_bytes(const struct mlxsw_sp *mlxsw_sp, u32 cells);

u32 mlxsw_sp_bytes_cells(const struct mlxsw_sp *mlxsw_sp, u32 bytes);

u32 mlxsw_sp_sb_max_headroom_cells(const struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_hdroom_prios_reset_buf_idx(struct mlxsw_sp_hdroom *hdroom);

void mlxsw_sp_hdroom_bufs_reset_lossiness(struct mlxsw_sp_hdroom *hdroom);

void mlxsw_sp_hdroom_bufs_reset_sizes(struct mlxsw_sp_port *mlxsw_sp_port,

drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c

+1 −8
Original line number Diff line number Diff line
@@ -131,11 +131,6 @@ u32 mlxsw_sp_bytes_cells(const struct mlxsw_sp *mlxsw_sp, u32 bytes) 
	return DIV_ROUND_UP(bytes, mlxsw_sp->sb->cell_size);

}



u32 mlxsw_sp_sb_max_headroom_cells(const struct mlxsw_sp *mlxsw_sp)

{

	return mlxsw_sp->sb->max_headroom_cells;

}



static struct mlxsw_sp_sb_pr *mlxsw_sp_sb_pr_get(struct mlxsw_sp *mlxsw_sp,

						 u16 pool_index)

{
@@ -488,14 +483,12 @@ static bool mlxsw_sp_hdroom_bufs_fit(struct mlxsw_sp *mlxsw_sp, 
				     const struct mlxsw_sp_hdroom *hdroom)

{

	u32 taken_headroom_cells = 0;

	u32 max_headroom_cells;

	int i;



	for (i = 0; i < MLXSW_SP_PB_COUNT; i++)

		taken_headroom_cells += hdroom->bufs.buf[i].size_cells;



	max_headroom_cells = mlxsw_sp_sb_max_headroom_cells(mlxsw_sp);

	return taken_headroom_cells <= max_headroom_cells;

	return taken_headroom_cells <= mlxsw_sp->sb->max_headroom_cells;

}



static int __mlxsw_sp_hdroom_configure(struct mlxsw_sp_port *mlxsw_sp_port,

CRA Git | Maintained and supported by SUSTech CRA and CCSE