aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorVasily Averin <vvs@sw.ru>2007-07-17 07:04:27 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:06 -0400
commit6dd4ac3b30b81b5bd0d628af1c89b7da689a38ea (patch)
tree8247a748c72ac8f0b510144dff4d3ba40547bf31 /drivers/message
parent44aaa9384faf68717cf3828dce6f8171a0a5d7bf (diff)
i2o debug output cleanup
Fix output of i2o debug messages, extra KERN_ are removed. Signed-off-by: Vasily Averin <vvs@sw.ru> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Markus Lidel <Markus.Lidel@shadowconnect.com> Acked-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/i2o/debug.c134
1 files changed, 67 insertions, 67 deletions
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c
index 8abe45e49ad7..ce62d8bfe1c8 100644
--- a/drivers/message/i2o/debug.c
+++ b/drivers/message/i2o/debug.c
@@ -24,7 +24,7 @@ void i2o_report_status(const char *severity, const char *str,
24 if (cmd == I2O_CMD_UTIL_EVT_REGISTER) 24 if (cmd == I2O_CMD_UTIL_EVT_REGISTER)
25 return; // No status in this reply 25 return; // No status in this reply
26 26
27 printk(KERN_DEBUG "%s%s: ", severity, str); 27 printk("%s%s: ", severity, str);
28 28
29 if (cmd < 0x1F) // Utility cmd 29 if (cmd < 0x1F) // Utility cmd
30 i2o_report_util_cmd(cmd); 30 i2o_report_util_cmd(cmd);
@@ -32,7 +32,7 @@ void i2o_report_status(const char *severity, const char *str,
32 else if (cmd >= 0xA0 && cmd <= 0xEF) // Executive cmd 32 else if (cmd >= 0xA0 && cmd <= 0xEF) // Executive cmd
33 i2o_report_exec_cmd(cmd); 33 i2o_report_exec_cmd(cmd);
34 else 34 else
35 printk(KERN_DEBUG "Cmd = %0#2x, ", cmd); // Other cmds 35 printk("Cmd = %0#2x, ", cmd); // Other cmds
36 36
37 if (msg[0] & MSG_FAIL) { 37 if (msg[0] & MSG_FAIL) {
38 i2o_report_fail_status(req_status, msg); 38 i2o_report_fail_status(req_status, msg);
@@ -44,7 +44,7 @@ void i2o_report_status(const char *severity, const char *str,
44 if (cmd < 0x1F || (cmd >= 0xA0 && cmd <= 0xEF)) 44 if (cmd < 0x1F || (cmd >= 0xA0 && cmd <= 0xEF))
45 i2o_report_common_dsc(detailed_status); 45 i2o_report_common_dsc(detailed_status);
46 else 46 else
47 printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n", 47 printk(" / DetailedStatus = %0#4x.\n",
48 detailed_status); 48 detailed_status);
49} 49}
50 50
@@ -89,10 +89,10 @@ static void i2o_report_fail_status(u8 req_status, u32 * msg)
89 }; 89 };
90 90
91 if (req_status == I2O_FSC_TRANSPORT_UNKNOWN_FAILURE) 91 if (req_status == I2O_FSC_TRANSPORT_UNKNOWN_FAILURE)
92 printk(KERN_DEBUG "TRANSPORT_UNKNOWN_FAILURE (%0#2x).\n", 92 printk("TRANSPORT_UNKNOWN_FAILURE (%0#2x).\n",
93 req_status); 93 req_status);
94 else 94 else
95 printk(KERN_DEBUG "TRANSPORT_%s.\n", 95 printk("TRANSPORT_%s.\n",
96 FAIL_STATUS[req_status & 0x0F]); 96 FAIL_STATUS[req_status & 0x0F]);
97 97
98 /* Dump some details */ 98 /* Dump some details */
@@ -104,7 +104,7 @@ static void i2o_report_fail_status(u8 req_status, u32 * msg)
104 printk(KERN_ERR " FailingHostUnit = 0x%04X, FailingIOP = 0x%03X\n", 104 printk(KERN_ERR " FailingHostUnit = 0x%04X, FailingIOP = 0x%03X\n",
105 msg[5] >> 16, msg[5] & 0xFFF); 105 msg[5] >> 16, msg[5] & 0xFFF);
106 106
107 printk(KERN_ERR " Severity: 0x%02X ", (msg[4] >> 16) & 0xFF); 107 printk(KERN_ERR " Severity: 0x%02X\n", (msg[4] >> 16) & 0xFF);
108 if (msg[4] & (1 << 16)) 108 if (msg[4] & (1 << 16))
109 printk(KERN_DEBUG "(FormatError), " 109 printk(KERN_DEBUG "(FormatError), "
110 "this msg can never be delivered/processed.\n"); 110 "this msg can never be delivered/processed.\n");
@@ -142,9 +142,9 @@ static void i2o_report_common_status(u8 req_status)
142 }; 142 };
143 143
144 if (req_status >= ARRAY_SIZE(REPLY_STATUS)) 144 if (req_status >= ARRAY_SIZE(REPLY_STATUS))
145 printk(KERN_DEBUG "RequestStatus = %0#2x", req_status); 145 printk("RequestStatus = %0#2x", req_status);
146 else 146 else
147 printk(KERN_DEBUG "%s", REPLY_STATUS[req_status]); 147 printk("%s", REPLY_STATUS[req_status]);
148} 148}
149 149
150/* 150/*
@@ -187,10 +187,10 @@ static void i2o_report_common_dsc(u16 detailed_status)
187 }; 187 };
188 188
189 if (detailed_status > I2O_DSC_DEVICE_NOT_AVAILABLE) 189 if (detailed_status > I2O_DSC_DEVICE_NOT_AVAILABLE)
190 printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n", 190 printk(" / DetailedStatus = %0#4x.\n",
191 detailed_status); 191 detailed_status);
192 else 192 else
193 printk(KERN_DEBUG " / %s.\n", COMMON_DSC[detailed_status]); 193 printk(" / %s.\n", COMMON_DSC[detailed_status]);
194} 194}
195 195
196/* 196/*
@@ -200,49 +200,49 @@ static void i2o_report_util_cmd(u8 cmd)
200{ 200{
201 switch (cmd) { 201 switch (cmd) {
202 case I2O_CMD_UTIL_NOP: 202 case I2O_CMD_UTIL_NOP:
203 printk(KERN_DEBUG "UTIL_NOP, "); 203 printk("UTIL_NOP, ");
204 break; 204 break;
205 case I2O_CMD_UTIL_ABORT: 205 case I2O_CMD_UTIL_ABORT:
206 printk(KERN_DEBUG "UTIL_ABORT, "); 206 printk("UTIL_ABORT, ");
207 break; 207 break;
208 case I2O_CMD_UTIL_CLAIM: 208 case I2O_CMD_UTIL_CLAIM:
209 printk(KERN_DEBUG "UTIL_CLAIM, "); 209 printk("UTIL_CLAIM, ");
210 break; 210 break;
211 case I2O_CMD_UTIL_RELEASE: 211 case I2O_CMD_UTIL_RELEASE:
212 printk(KERN_DEBUG "UTIL_CLAIM_RELEASE, "); 212 printk("UTIL_CLAIM_RELEASE, ");
213 break; 213 break;
214 case I2O_CMD_UTIL_CONFIG_DIALOG: 214 case I2O_CMD_UTIL_CONFIG_DIALOG:
215 printk(KERN_DEBUG "UTIL_CONFIG_DIALOG, "); 215 printk("UTIL_CONFIG_DIALOG, ");
216 break; 216 break;
217 case I2O_CMD_UTIL_DEVICE_RESERVE: 217 case I2O_CMD_UTIL_DEVICE_RESERVE:
218 printk(KERN_DEBUG "UTIL_DEVICE_RESERVE, "); 218 printk("UTIL_DEVICE_RESERVE, ");
219 break; 219 break;
220 case I2O_CMD_UTIL_DEVICE_RELEASE: 220 case I2O_CMD_UTIL_DEVICE_RELEASE:
221 printk(KERN_DEBUG "UTIL_DEVICE_RELEASE, "); 221 printk("UTIL_DEVICE_RELEASE, ");
222 break; 222 break;
223 case I2O_CMD_UTIL_EVT_ACK: 223 case I2O_CMD_UTIL_EVT_ACK:
224 printk(KERN_DEBUG "UTIL_EVENT_ACKNOWLEDGE, "); 224 printk("UTIL_EVENT_ACKNOWLEDGE, ");
225 break; 225 break;
226 case I2O_CMD_UTIL_EVT_REGISTER: 226 case I2O_CMD_UTIL_EVT_REGISTER:
227 printk(KERN_DEBUG "UTIL_EVENT_REGISTER, "); 227 printk("UTIL_EVENT_REGISTER, ");
228 break; 228 break;
229 case I2O_CMD_UTIL_LOCK: 229 case I2O_CMD_UTIL_LOCK:
230 printk(KERN_DEBUG "UTIL_LOCK, "); 230 printk("UTIL_LOCK, ");
231 break; 231 break;
232 case I2O_CMD_UTIL_LOCK_RELEASE: 232 case I2O_CMD_UTIL_LOCK_RELEASE:
233 printk(KERN_DEBUG "UTIL_LOCK_RELEASE, "); 233 printk("UTIL_LOCK_RELEASE, ");
234 break; 234 break;
235 case I2O_CMD_UTIL_PARAMS_GET: 235 case I2O_CMD_UTIL_PARAMS_GET:
236 printk(KERN_DEBUG "UTIL_PARAMS_GET, "); 236 printk("UTIL_PARAMS_GET, ");
237 break; 237 break;
238 case I2O_CMD_UTIL_PARAMS_SET: 238 case I2O_CMD_UTIL_PARAMS_SET:
239 printk(KERN_DEBUG "UTIL_PARAMS_SET, "); 239 printk("UTIL_PARAMS_SET, ");
240 break; 240 break;
241 case I2O_CMD_UTIL_REPLY_FAULT_NOTIFY: 241 case I2O_CMD_UTIL_REPLY_FAULT_NOTIFY:
242 printk(KERN_DEBUG "UTIL_REPLY_FAULT_NOTIFY, "); 242 printk("UTIL_REPLY_FAULT_NOTIFY, ");
243 break; 243 break;
244 default: 244 default:
245 printk(KERN_DEBUG "Cmd = %0#2x, ", cmd); 245 printk("Cmd = %0#2x, ", cmd);
246 } 246 }
247} 247}
248 248
@@ -253,106 +253,106 @@ static void i2o_report_exec_cmd(u8 cmd)
253{ 253{
254 switch (cmd) { 254 switch (cmd) {
255 case I2O_CMD_ADAPTER_ASSIGN: 255 case I2O_CMD_ADAPTER_ASSIGN:
256 printk(KERN_DEBUG "EXEC_ADAPTER_ASSIGN, "); 256 printk("EXEC_ADAPTER_ASSIGN, ");
257 break; 257 break;
258 case I2O_CMD_ADAPTER_READ: 258 case I2O_CMD_ADAPTER_READ:
259 printk(KERN_DEBUG "EXEC_ADAPTER_READ, "); 259 printk("EXEC_ADAPTER_READ, ");
260 break; 260 break;
261 case I2O_CMD_ADAPTER_RELEASE: 261 case I2O_CMD_ADAPTER_RELEASE:
262 printk(KERN_DEBUG "EXEC_ADAPTER_RELEASE, "); 262 printk("EXEC_ADAPTER_RELEASE, ");
263 break; 263 break;
264 case I2O_CMD_BIOS_INFO_SET: 264 case I2O_CMD_BIOS_INFO_SET:
265 printk(KERN_DEBUG "EXEC_BIOS_INFO_SET, "); 265 printk("EXEC_BIOS_INFO_SET, ");
266 break; 266 break;
267 case I2O_CMD_BOOT_DEVICE_SET: 267 case I2O_CMD_BOOT_DEVICE_SET:
268 printk(KERN_DEBUG "EXEC_BOOT_DEVICE_SET, "); 268 printk("EXEC_BOOT_DEVICE_SET, ");
269 break; 269 break;
270 case I2O_CMD_CONFIG_VALIDATE: 270 case I2O_CMD_CONFIG_VALIDATE:
271 printk(KERN_DEBUG "EXEC_CONFIG_VALIDATE, "); 271 printk("EXEC_CONFIG_VALIDATE, ");
272 break; 272 break;
273 case I2O_CMD_CONN_SETUP: 273 case I2O_CMD_CONN_SETUP:
274 printk(KERN_DEBUG "EXEC_CONN_SETUP, "); 274 printk("EXEC_CONN_SETUP, ");
275 break; 275 break;
276 case I2O_CMD_DDM_DESTROY: 276 case I2O_CMD_DDM_DESTROY:
277 printk(KERN_DEBUG "EXEC_DDM_DESTROY, "); 277 printk("EXEC_DDM_DESTROY, ");
278 break; 278 break;
279 case I2O_CMD_DDM_ENABLE: 279 case I2O_CMD_DDM_ENABLE:
280 printk(KERN_DEBUG "EXEC_DDM_ENABLE, "); 280 printk("EXEC_DDM_ENABLE, ");
281 break; 281 break;
282 case I2O_CMD_DDM_QUIESCE: 282 case I2O_CMD_DDM_QUIESCE:
283 printk(KERN_DEBUG "EXEC_DDM_QUIESCE, "); 283 printk("EXEC_DDM_QUIESCE, ");
284 break; 284 break;
285 case I2O_CMD_DDM_RESET: 285 case I2O_CMD_DDM_RESET:
286 printk(KERN_DEBUG "EXEC_DDM_RESET, "); 286 printk("EXEC_DDM_RESET, ");
287 break; 287 break;
288 case I2O_CMD_DDM_SUSPEND: 288 case I2O_CMD_DDM_SUSPEND:
289 printk(KERN_DEBUG "EXEC_DDM_SUSPEND, "); 289 printk("EXEC_DDM_SUSPEND, ");
290 break; 290 break;
291 case I2O_CMD_DEVICE_ASSIGN: 291 case I2O_CMD_DEVICE_ASSIGN:
292 printk(KERN_DEBUG "EXEC_DEVICE_ASSIGN, "); 292 printk("EXEC_DEVICE_ASSIGN, ");
293 break; 293 break;
294 case I2O_CMD_DEVICE_RELEASE: 294 case I2O_CMD_DEVICE_RELEASE:
295 printk(KERN_DEBUG "EXEC_DEVICE_RELEASE, "); 295 printk("EXEC_DEVICE_RELEASE, ");
296 break; 296 break;
297 case I2O_CMD_HRT_GET: 297 case I2O_CMD_HRT_GET:
298 printk(KERN_DEBUG "EXEC_HRT_GET, "); 298 printk("EXEC_HRT_GET, ");
299 break; 299 break;
300 case I2O_CMD_ADAPTER_CLEAR: 300 case I2O_CMD_ADAPTER_CLEAR:
301 printk(KERN_DEBUG "EXEC_IOP_CLEAR, "); 301 printk("EXEC_IOP_CLEAR, ");
302 break; 302 break;
303 case I2O_CMD_ADAPTER_CONNECT: 303 case I2O_CMD_ADAPTER_CONNECT:
304 printk(KERN_DEBUG "EXEC_IOP_CONNECT, "); 304 printk("EXEC_IOP_CONNECT, ");
305 break; 305 break;
306 case I2O_CMD_ADAPTER_RESET: 306 case I2O_CMD_ADAPTER_RESET:
307 printk(KERN_DEBUG "EXEC_IOP_RESET, "); 307 printk("EXEC_IOP_RESET, ");
308 break; 308 break;
309 case I2O_CMD_LCT_NOTIFY: 309 case I2O_CMD_LCT_NOTIFY:
310 printk(KERN_DEBUG "EXEC_LCT_NOTIFY, "); 310 printk("EXEC_LCT_NOTIFY, ");
311 break; 311 break;
312 case I2O_CMD_OUTBOUND_INIT: 312 case I2O_CMD_OUTBOUND_INIT:
313 printk(KERN_DEBUG "EXEC_OUTBOUND_INIT, "); 313 printk("EXEC_OUTBOUND_INIT, ");
314 break; 314 break;
315 case I2O_CMD_PATH_ENABLE: 315 case I2O_CMD_PATH_ENABLE:
316 printk(KERN_DEBUG "EXEC_PATH_ENABLE, "); 316 printk("EXEC_PATH_ENABLE, ");
317 break; 317 break;
318 case I2O_CMD_PATH_QUIESCE: 318 case I2O_CMD_PATH_QUIESCE:
319 printk(KERN_DEBUG "EXEC_PATH_QUIESCE, "); 319 printk("EXEC_PATH_QUIESCE, ");
320 break; 320 break;
321 case I2O_CMD_PATH_RESET: 321 case I2O_CMD_PATH_RESET:
322 printk(KERN_DEBUG "EXEC_PATH_RESET, "); 322 printk("EXEC_PATH_RESET, ");
323 break; 323 break;
324 case I2O_CMD_STATIC_MF_CREATE: 324 case I2O_CMD_STATIC_MF_CREATE:
325 printk(KERN_DEBUG "EXEC_STATIC_MF_CREATE, "); 325 printk("EXEC_STATIC_MF_CREATE, ");
326 break; 326 break;
327 case I2O_CMD_STATIC_MF_RELEASE: 327 case I2O_CMD_STATIC_MF_RELEASE:
328 printk(KERN_DEBUG "EXEC_STATIC_MF_RELEASE, "); 328 printk("EXEC_STATIC_MF_RELEASE, ");
329 break; 329 break;
330 case I2O_CMD_STATUS_GET: 330 case I2O_CMD_STATUS_GET:
331 printk(KERN_DEBUG "EXEC_STATUS_GET, "); 331 printk("EXEC_STATUS_GET, ");
332 break; 332 break;
333 case I2O_CMD_SW_DOWNLOAD: 333 case I2O_CMD_SW_DOWNLOAD:
334 printk(KERN_DEBUG "EXEC_SW_DOWNLOAD, "); 334 printk("EXEC_SW_DOWNLOAD, ");
335 break; 335 break;
336 case I2O_CMD_SW_UPLOAD: 336 case I2O_CMD_SW_UPLOAD:
337 printk(KERN_DEBUG "EXEC_SW_UPLOAD, "); 337 printk("EXEC_SW_UPLOAD, ");
338 break; 338 break;
339 case I2O_CMD_SW_REMOVE: 339 case I2O_CMD_SW_REMOVE:
340 printk(KERN_DEBUG "EXEC_SW_REMOVE, "); 340 printk("EXEC_SW_REMOVE, ");
341 break; 341 break;
342 case I2O_CMD_SYS_ENABLE: 342 case I2O_CMD_SYS_ENABLE:
343 printk(KERN_DEBUG "EXEC_SYS_ENABLE, "); 343 printk("EXEC_SYS_ENABLE, ");
344 break; 344 break;
345 case I2O_CMD_SYS_MODIFY: 345 case I2O_CMD_SYS_MODIFY:
346 printk(KERN_DEBUG "EXEC_SYS_MODIFY, "); 346 printk("EXEC_SYS_MODIFY, ");
347 break; 347 break;
348 case I2O_CMD_SYS_QUIESCE: 348 case I2O_CMD_SYS_QUIESCE:
349 printk(KERN_DEBUG "EXEC_SYS_QUIESCE, "); 349 printk("EXEC_SYS_QUIESCE, ");
350 break; 350 break;
351 case I2O_CMD_SYS_TAB_SET: 351 case I2O_CMD_SYS_TAB_SET:
352 printk(KERN_DEBUG "EXEC_SYS_TAB_SET, "); 352 printk("EXEC_SYS_TAB_SET, ");
353 break; 353 break;
354 default: 354 default:
355 printk(KERN_DEBUG "Cmd = %#02x, ", cmd); 355 printk("Cmd = %#02x, ", cmd);
356 } 356 }
357} 357}
358 358
@@ -361,28 +361,28 @@ void i2o_debug_state(struct i2o_controller *c)
361 printk(KERN_INFO "%s: State = ", c->name); 361 printk(KERN_INFO "%s: State = ", c->name);
362 switch (((i2o_status_block *) c->status_block.virt)->iop_state) { 362 switch (((i2o_status_block *) c->status_block.virt)->iop_state) {
363 case 0x01: 363 case 0x01:
364 printk(KERN_DEBUG "INIT\n"); 364 printk("INIT\n");
365 break; 365 break;
366 case 0x02: 366 case 0x02:
367 printk(KERN_DEBUG "RESET\n"); 367 printk("RESET\n");
368 break; 368 break;
369 case 0x04: 369 case 0x04:
370 printk(KERN_DEBUG "HOLD\n"); 370 printk("HOLD\n");
371 break; 371 break;
372 case 0x05: 372 case 0x05:
373 printk(KERN_DEBUG "READY\n"); 373 printk("READY\n");
374 break; 374 break;
375 case 0x08: 375 case 0x08:
376 printk(KERN_DEBUG "OPERATIONAL\n"); 376 printk("OPERATIONAL\n");
377 break; 377 break;
378 case 0x10: 378 case 0x10:
379 printk(KERN_DEBUG "FAILED\n"); 379 printk("FAILED\n");
380 break; 380 break;
381 case 0x11: 381 case 0x11:
382 printk(KERN_DEBUG "FAULTED\n"); 382 printk("FAULTED\n");
383 break; 383 break;
384 default: 384 default:
385 printk(KERN_DEBUG "%x (unknown !!)\n", 385 printk("%x (unknown !!)\n",
386 ((i2o_status_block *) c->status_block.virt)->iop_state); 386 ((i2o_status_block *) c->status_block.virt)->iop_state);
387 } 387 }
388}; 388};