Skip to content

Commit

Permalink
nfc: do not break pr_debug() call into separate lines
Browse files Browse the repository at this point in the history
Remove unneeded line break between pr_debug and arguments.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
krzk authored and davem330 committed Sep 13, 2021
1 parent 9eb4c32 commit 3537e50
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions net/nfc/hci/llc_shdlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr)
del_timer_sync(&shdlc->t2_timer);
shdlc->t2_active = false;

pr_debug
("All sent frames acked. Stopped T2(retransmit)\n");
pr_debug("All sent frames acked. Stopped T2(retransmit)\n");
}
} else {
skb = skb_peek(&shdlc->ack_pending_q);
Expand All @@ -211,8 +210,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr)
msecs_to_jiffies(SHDLC_T2_VALUE_MS));
shdlc->t2_active = true;

pr_debug
("Start T2(retransmit) for remaining unacked sent frames\n");
pr_debug("Start T2(retransmit) for remaining unacked sent frames\n");
}
}

Expand Down Expand Up @@ -522,12 +520,11 @@ static void llc_shdlc_handle_send_queue(struct llc_shdlc *shdlc)
unsigned long time_sent;

if (shdlc->send_q.qlen)
pr_debug
("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n",
shdlc->send_q.qlen, shdlc->ns, shdlc->dnr,
shdlc->rnr == false ? "false" : "true",
shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr),
shdlc->ack_pending_q.qlen);
pr_debug("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n",
shdlc->send_q.qlen, shdlc->ns, shdlc->dnr,
shdlc->rnr == false ? "false" : "true",
shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr),
shdlc->ack_pending_q.qlen);

while (shdlc->send_q.qlen && shdlc->ack_pending_q.qlen < shdlc->w &&
(shdlc->rnr == false)) {
Expand Down Expand Up @@ -649,8 +646,7 @@ static void llc_shdlc_sm_work(struct work_struct *work)
llc_shdlc_handle_send_queue(shdlc);

if (shdlc->t1_active && timer_pending(&shdlc->t1_timer) == 0) {
pr_debug
("Handle T1(send ack) elapsed (T1 now inactive)\n");
pr_debug("Handle T1(send ack) elapsed (T1 now inactive)\n");

shdlc->t1_active = false;
r = llc_shdlc_send_s_frame(shdlc, S_FRAME_RR,
Expand All @@ -660,8 +656,7 @@ static void llc_shdlc_sm_work(struct work_struct *work)
}

if (shdlc->t2_active && timer_pending(&shdlc->t2_timer) == 0) {
pr_debug
("Handle T2(retransmit) elapsed (T2 inactive)\n");
pr_debug("Handle T2(retransmit) elapsed (T2 inactive)\n");

shdlc->t2_active = false;

Expand Down

0 comments on commit 3537e50

Please sign in to comment.