Merge branch 'mlx4-next'

Amir Vadai says:

====================
net/mlx4_core: Deprecate module parameter use_prio

This small patchset deprecates the mlx4_core module paramater 'use_prio', as
suggested by Carol Soto from IBM in [1].
Also, replaced some calls to the prefered pr_warn/info/devel macro's.

Patchset was applied and tested on commit b6052af: "Merge tag
'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge"

[1] - http://marc.info/?l=linux-netdev&m=139871350103432&w=2
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 357dcb0f04fb..59c7fd406805 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1887,9 +1887,9 @@ 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",
-                                               slave, slt,
-                                               master->slave_state[slave].comm_toggle);
+                                        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 =
                                                 slt;
                                 }