File tree Expand file tree Collapse file tree 3 files changed +33
-12
lines changed Expand file tree Collapse file tree 3 files changed +33
-12
lines changed Original file line number Diff line number Diff line change @@ -99,12 +99,16 @@ static void
99
99
l1m_debug (struct FsmInst * fi , char * fmt , ...)
100
100
{
101
101
struct layer1 * l1 = fi -> userdata ;
102
+ struct va_format vaf ;
102
103
va_list va ;
103
104
104
105
va_start (va , fmt );
105
- printk (KERN_DEBUG "%s: " , dev_name (& l1 -> dch -> dev .dev ));
106
- vprintk (fmt , va );
107
- printk ("\n" );
106
+
107
+ vaf .fmt = fmt ;
108
+ vaf .va = & va ;
109
+
110
+ printk (KERN_DEBUG "%s: %pV\n" , dev_name (& l1 -> dch -> dev .dev ), & vaf );
111
+
108
112
va_end (va );
109
113
}
110
114
Original file line number Diff line number Diff line change @@ -95,14 +95,20 @@ static void
95
95
l2m_debug (struct FsmInst * fi , char * fmt , ...)
96
96
{
97
97
struct layer2 * l2 = fi -> userdata ;
98
+ struct va_format vaf ;
98
99
va_list va ;
99
100
100
101
if (!(* debug & DEBUG_L2_FSM ))
101
102
return ;
103
+
102
104
va_start (va , fmt );
103
- printk (KERN_DEBUG "l2 (sapi %d tei %d): " , l2 -> sapi , l2 -> tei );
104
- vprintk (fmt , va );
105
- printk ("\n" );
105
+
106
+ vaf .fmt = fmt ;
107
+ vaf .va = & va ;
108
+
109
+ printk (KERN_DEBUG "l2 (sapi %d tei %d): %pV\n" ,
110
+ l2 -> sapi , l2 -> tei , & vaf );
111
+
106
112
va_end (va );
107
113
}
108
114
Original file line number Diff line number Diff line change @@ -79,14 +79,19 @@ static void
79
79
da_debug (struct FsmInst * fi , char * fmt , ...)
80
80
{
81
81
struct manager * mgr = fi -> userdata ;
82
+ struct va_format vaf ;
82
83
va_list va ;
83
84
84
85
if (!(* debug & DEBUG_L2_TEIFSM ))
85
86
return ;
87
+
86
88
va_start (va , fmt );
87
- printk (KERN_DEBUG "mgr(%d): " , mgr -> ch .st -> dev -> id );
88
- vprintk (fmt , va );
89
- printk ("\n" );
89
+
90
+ vaf .fmt = fmt ;
91
+ vaf .va = & va ;
92
+
93
+ printk (KERN_DEBUG "mgr(%d): %pV\n" , mgr -> ch .st -> dev -> id , & vaf );
94
+
90
95
va_end (va );
91
96
}
92
97
@@ -223,14 +228,20 @@ static void
223
228
tei_debug (struct FsmInst * fi , char * fmt , ...)
224
229
{
225
230
struct teimgr * tm = fi -> userdata ;
231
+ struct va_format vaf ;
226
232
va_list va ;
227
233
228
234
if (!(* debug & DEBUG_L2_TEIFSM ))
229
235
return ;
236
+
230
237
va_start (va , fmt );
231
- printk (KERN_DEBUG "sapi(%d) tei(%d): " , tm -> l2 -> sapi , tm -> l2 -> tei );
232
- vprintk (fmt , va );
233
- printk ("\n" );
238
+
239
+ vaf .fmt = fmt ;
240
+ vaf .va = & va ;
241
+
242
+ printk (KERN_DEBUG "sapi(%d) tei(%d): %pV\n" ,
243
+ tm -> l2 -> sapi , tm -> l2 -> tei , & vaf );
244
+
234
245
va_end (va );
235
246
}
236
247
You can’t perform that action at this time.
0 commit comments