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, 5 insertions, 5 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index a95df9d2645d..4094e11f9d4d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -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,10 +1056,10 @@ 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",
-                       __func__, __LINE__,
-                       mtt_states_str(res->com.state),
-                       atomic_read(&res->ref_count));
+                pr_devel("%s-%d: state %s, ref_count %d\n",
+                         __func__, __LINE__,
+                         mtt_states_str(res->com.state),
+                         atomic_read(&res->ref_count));
                 return -EBUSY;
         } else if (res->com.state != RES_MTT_ALLOCATED)
                 return -EPERM;