Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0b15a3a5285bac2a2caa4ef970410674b6dd2de5

Authored by Eric Van Hensbergen
Committed by Eric Van Hensbergen
1 parent 2515ddc6db
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

9p: fix debug build error 

Fixes build problem with 9p when building with debug disabled.
Also contains some fixes for warnings which pop up when
CONFIG_NET_9P_DEBUG is disabled.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

Showing 3 changed files with 11 additions and 4 deletions Side-by-side Diff

... ... @@ -56,9 +56,9 @@
56 56 P9_DEBUG_PKT = (1<<10),
57 57 };
58 58  
  59 +#ifdef CONFIG_NET_9P_DEBUG
59 60 extern unsigned int p9_debug_level;
60 61  
61   -#ifdef CONFIG_NET_9P_DEBUG
62 62 #define P9_DPRINTK(level, format, arg...) \
63 63 do { \
64 64 if ((p9_debug_level & level) == level) {\
... ... @@ -53,6 +53,7 @@
53 53 static int
54 54 p9pdu_writef(struct p9_fcall *pdu, int optional, const char *fmt, ...);
55 55  
  56 +#ifdef CONFIG_NET_9P_DEBUG
56 57 void
57 58 p9pdu_dump(int way, struct p9_fcall *pdu)
58 59 {
... ... @@ -81,6 +82,12 @@
81 82 else
82 83 P9_DPRINTK(P9_DEBUG_PKT, "]]](%d) %s\n", datalen, buf);
83 84 }
  85 +#else
  86 +void
  87 +p9pdu_dump(int way, struct p9_fcall *pdu)
  88 +{
  89 +}
  90 +#endif
84 91 EXPORT_SYMBOL(p9pdu_dump);
85 92  
86 93 void p9stat_free(struct p9_wstat *stbuf)
87 94  
... ... @@ -542,8 +549,10 @@
542 549 err = p9pdu_writef(pdu, 0, "d", size);
543 550 pdu->size = size;
544 551  
  552 +#ifdef CONFIG_NET_9P_DEBUG
545 553 if ((p9_debug_level & P9_DEBUG_PKT) == P9_DEBUG_PKT)
546 554 p9pdu_dump(0, pdu);
  555 +#endif
547 556  
548 557 P9_DPRINTK(P9_DEBUG_9P, ">>> size=%d type: %d tag: %d\n", pdu->size,
549 558 pdu->id, pdu->tag);
... ... @@ -678,11 +678,9 @@
678 678  
679 679 static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)
680 680 {
681   - struct p9_trans_fd *ts = client->trans;
682   - struct p9_conn *m = ts->conn;
683 681 int ret = 1;
684 682  
685   - P9_DPRINTK(P9_DEBUG_TRANS, "mux %p req %p\n", m, req);
  683 + P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req);
686 684  
687 685 spin_lock(&client->lock);
688 686 list_del(&req->req_list);