diff options
author | Joe Perches <joe@perches.com> | 2011-08-14 12:16:20 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-17 15:47:23 -0700 |
commit | 94f05b0f60de32e6efa19310bd142f1519e2abdb (patch) | |
tree | 9d7f9b70833d1acdb0798d68b49c6cd309cefc58 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | |
parent | 0f9dad10a040fa72c588db46a94c9e96545cc509 (diff) | |
download | kernel_goldelico_gta04-94f05b0f60de32e6efa19310bd142f1519e2abdb.zip kernel_goldelico_gta04-94f05b0f60de32e6efa19310bd142f1519e2abdb.tar.gz kernel_goldelico_gta04-94f05b0f60de32e6efa19310bd142f1519e2abdb.tar.bz2 |
bnx2x: Coalesce pr_cont uses and fix DP typos
Uses of pr_cont should be avoided where reasonably possible
because they can be interleaved by other threads and processes.
Coalesce pr_cont uses.
Fix typos, duplicated words and spacing in DP uses caused
by split multi-line formats. Coalesce some of these
split formats. Add missing terminating newlines to DP uses.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c index b4d9c16..1f88c19 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c @@ -3045,8 +3045,8 @@ static int bnx2x_mcast_setup_e1h(struct bnx2x *bp, break; case BNX2X_MCAST_CMD_DEL: - DP(BNX2X_MSG_SP, "Invalidating multicast " - "MACs configuration\n"); + DP(BNX2X_MSG_SP, + "Invalidating multicast MACs configuration\n"); /* clear the registry */ memset(o->registry.aprox_match.vec, 0, @@ -4239,7 +4239,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp, o->cids[BNX2X_PRIMARY_CID_INDEX], o->next_state); if (o->next_tx_only) /* print num tx-only if any exist */ - DP(BNX2X_MSG_SP, "primary cid %d: num tx-only cons %d", + DP(BNX2X_MSG_SP, "primary cid %d: num tx-only cons %d\n", o->cids[BNX2X_PRIMARY_CID_INDEX], o->next_tx_only); o->state = o->next_state; @@ -4301,7 +4301,7 @@ static void bnx2x_q_fill_init_general_data(struct bnx2x *bp, test_bit(BNX2X_Q_FLG_FCOE, flags) ? LLFC_TRAFFIC_TYPE_FCOE : LLFC_TRAFFIC_TYPE_NW; - DP(BNX2X_MSG_SP, "flags: active %d, cos %d, stats en %d", + DP(BNX2X_MSG_SP, "flags: active %d, cos %d, stats en %d\n", gen_data->activate_flg, gen_data->cos, gen_data->statistics_en_flg); } @@ -4454,7 +4454,7 @@ static void bnx2x_q_fill_setup_tx_only(struct bnx2x *bp, &data->tx, &cmd_params->params.tx_only.flags); - DP(BNX2X_MSG_SP, "cid %d, tx bd page lo %x hi %x",cmd_params->q_obj->cids[0], + DP(BNX2X_MSG_SP, "cid %d, tx bd page lo %x hi %x\n",cmd_params->q_obj->cids[0], data->tx.tx_bd_page_base.lo, data->tx.tx_bd_page_base.hi); } @@ -4501,9 +4501,9 @@ static inline int bnx2x_q_init(struct bnx2x *bp, /* Set CDU context validation values */ for (cos = 0; cos < o->max_cos; cos++) { - DP(BNX2X_MSG_SP, "setting context validation. cid %d, cos %d", + DP(BNX2X_MSG_SP, "setting context validation. cid %d, cos %d\n", o->cids[cos], cos); - DP(BNX2X_MSG_SP, "context pointer %p", init->cxts[cos]); + DP(BNX2X_MSG_SP, "context pointer %p\n", init->cxts[cos]); bnx2x_set_ctx_validation(bp, init->cxts[cos], o->cids[cos]); } @@ -4592,7 +4592,7 @@ static inline int bnx2x_q_send_setup_tx_only(struct bnx2x *bp, return -EINVAL; } - DP(BNX2X_MSG_SP, "parameters received: cos: %d sp-id: %d", + DP(BNX2X_MSG_SP, "parameters received: cos: %d sp-id: %d\n", tx_only_params->gen_params.cos, tx_only_params->gen_params.spcl_id); @@ -4603,7 +4603,7 @@ static inline int bnx2x_q_send_setup_tx_only(struct bnx2x *bp, bnx2x_q_fill_setup_tx_only(bp, params, rdata); DP(BNX2X_MSG_SP, "sending tx-only ramrod: cid %d, client-id %d," - "sp-client id %d, cos %d", + "sp-client id %d, cos %d\n", o->cids[cid_index], rdata->general.client_id, rdata->general.sp_client_id, rdata->general.cos); @@ -5160,8 +5160,9 @@ static inline int bnx2x_func_state_change_comp(struct bnx2x *bp, return -EINVAL; } - DP(BNX2X_MSG_SP, "Completing command %d for func %d, setting state to " - "%d\n", cmd, BP_FUNC(bp), o->next_state); + DP(BNX2X_MSG_SP, + "Completing command %d for func %d, setting state to %d\n", + cmd, BP_FUNC(bp), o->next_state); o->state = o->next_state; o->next_state = BNX2X_F_STATE_MAX; |