Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deb8b3e8 authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by David S. Miller
Browse files

mlx4: remove unnecessary variables and arguments 



mlx4_qp_attach/detach_common() don't use hash variable, move it to find_entry()
static find_entry() in mcg.c doesn't use steer argument

Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.co.il>
Reviewed-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45b51365

drivers/net/ethernet/mellanox/mlx4/mcg.c

+10 −12
Original line number Diff line number Diff line
@@ -562,14 +562,14 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 port, 
 */

static int find_entry(struct mlx4_dev *dev, u8 port,

		      u8 *gid, enum mlx4_protocol prot,

		      enum mlx4_steer_type steer,

		      struct mlx4_cmd_mailbox *mgm_mailbox,

		      u16 *hash, int *prev, int *index)

		      int *prev, int *index)

{

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_mgm *mgm = mgm_mailbox->buf;

	u8 *mgid;

	int err;

	u16 hash;

	u8 op_mod = (prot == MLX4_PROT_ETH) ?

		!!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) : 0;
@@ -580,15 +580,15 @@ static int find_entry(struct mlx4_dev *dev, u8 port, 


	memcpy(mgid, gid, 16);



	err = mlx4_GID_HASH(dev, mailbox, hash, op_mod);

	err = mlx4_GID_HASH(dev, mailbox, &hash, op_mod);

	mlx4_free_cmd_mailbox(dev, mailbox);

	if (err)

		return err;



	if (0)

		mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);

		mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, hash);



	*index = *hash;

	*index = hash;

	*prev  = -1;



	do {
@@ -597,7 +597,7 @@ static int find_entry(struct mlx4_dev *dev, u8 port, 
			return err;



		if (!(be32_to_cpu(mgm->members_count) & 0xffffff)) {

			if (*index != *hash) {

			if (*index != hash) {

				mlx4_err(dev, "Found zero MGID in AMGM.\n");

				err = -EINVAL;

			}
@@ -624,7 +624,6 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], 
	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_mgm *mgm;

	u32 members_count;

	u16 hash;

	int index, prev;

	int link = 0;

	int i;
@@ -638,8 +637,8 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], 
	mgm = mailbox->buf;



	mutex_lock(&priv->mcg_table.mutex);

	err = find_entry(dev, port, gid, prot, steer,

			 mailbox, &hash, &prev, &index);

	err = find_entry(dev, port, gid, prot,

			 mailbox, &prev, &index);

	if (err)

		goto out;
@@ -733,7 +732,6 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], 
	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_mgm *mgm;

	u32 members_count;

	u16 hash;

	int prev, index;

	int i, loc;

	int err;
@@ -747,8 +745,8 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], 


	mutex_lock(&priv->mcg_table.mutex);



	err = find_entry(dev, port, gid, prot, steer,

			 mailbox, &hash, &prev, &index);

	err = find_entry(dev, port, gid, prot,

			 mailbox, &prev, &index);

	if (err)

		goto out;