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

Commit c20862c8 authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/mlx4_core: Replace pr_warning() with pr_warn() 



As checkpatch suggests. Also changed some printk's into pr_*

Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ecc8fb11

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

+3 −3
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ void mlx4_master_comm_channel(struct work_struct *work) 
			if (toggle != slt) {

				if (master->slave_state[slave].comm_toggle

				    != slt) {

					printk(KERN_INFO "slave %d out of sync. read toggle %d, state toggle %d. Resynching.\n",

					pr_info("slave %d out of sync. read toggle %d, state toggle %d. Resynching.\n",

						slave, slt,

						master->slave_state[slave].comm_toggle);

					master->slave_state[slave].comm_toggle =

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

+7 −6
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ static void __mlx4_remove_one(struct pci_dev *pdev) 
	/* in SRIOV it is not allowed to unload the pf's

	 * driver while there are alive vf's */

	if (mlx4_is_master(dev) && mlx4_how_many_lives_vf(dev))

		printk(KERN_ERR "Removing PF when there are assigned VF's !!!\n");

		pr_warn("Removing PF when there are assigned VF's !!!\n");

	mlx4_stop_sense(dev);

	mlx4_unregister_device(dev);
@@ -2764,25 +2764,26 @@ static struct pci_driver mlx4_driver = { 
static int __init mlx4_verify_params(void)

{

	if ((log_num_mac < 0) || (log_num_mac > 7)) {

		pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);

		pr_warn("mlx4_core: bad num_mac: %d\n", log_num_mac);

		return -1;

	}



	if (log_num_vlan != 0)

		pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",

		pr_warn("mlx4_core: log_num_vlan - obsolete module param, using %d\n",

			MLX4_LOG_NUM_VLANS);



	if (use_prio != 0)

		pr_warn("mlx4_core: use_prio - obsolete module param, ignored\n");



	if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {

		pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);

		pr_warn("mlx4_core: bad log_mtts_per_seg: %d\n",

			log_mtts_per_seg);

		return -1;

	}



	/* Check if module param for ports type has legal combination */

	if (port_type_array[0] == false && port_type_array[1] == true) {

		printk(KERN_WARNING "Module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");

		pr_warn("Module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");

		port_type_array[0] = true;

	}

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

+2 −4
Original line number Diff line number Diff line
@@ -954,8 +954,7 @@ void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr, 
	mailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(mailbox)) {

		err = PTR_ERR(mailbox);

		printk(KERN_WARNING "mlx4_ib: mlx4_alloc_cmd_mailbox failed (%d)\n",

		       err);

		pr_warn("mlx4_ib: mlx4_alloc_cmd_mailbox failed (%d)\n", err);

		return;

	}
@@ -964,8 +963,7 @@ void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr, 
			     (dev->caps.num_mpts - 1));

	mlx4_free_cmd_mailbox(dev, mailbox);

	if (err) {

		printk(KERN_WARNING "mlx4_ib: mlx4_HW2SW_MPT failed (%d)\n",

		       err);

		pr_warn("mlx4_ib: mlx4_HW2SW_MPT failed (%d)\n", err);

		return;

	}

	fmr->mr.enabled = MLX4_MPT_EN_SW;

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

+5 −5
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static struct res_common *alloc_tr(u64 id, enum mlx4_resource type, int slave, 
		ret = alloc_srq_tr(id);

		break;

	case RES_MAC:

		printk(KERN_ERR "implementation missing\n");

		pr_err("implementation missing\n");

		return NULL;

	case RES_COUNTER:

		ret = alloc_counter_tr(id);
@@ -1056,7 +1056,7 @@ static int remove_mtt_ok(struct res_mtt *res, int order) 
{

	if (res->com.state == RES_MTT_BUSY ||

	    atomic_read(&res->ref_count)) {

		printk(KERN_DEBUG "%s-%d: state %s, ref_count %d\n",

		pr_devel("%s-%d: state %s, ref_count %d\n",

			 __func__, __LINE__,

			 mtt_states_str(res->com.state),

			 atomic_read(&res->ref_count));