i2o debug output cleanup · tjh.dev/kernel@6dd4ac3

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Vasily Averin and committed by

Linus Torvalds 19 years ago 6dd4ac3b 44aaa938

+67 -67

1 changed file

expand all

drivers

message

i2o

debug.c

+67 -67

drivers/message/i2o/debug.c

··· 24 24 if (cmd == I2O_CMD_UTIL_EVT_REGISTER) 25 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 29 if (cmd < 0x1F) // Utility cmd 30 30 i2o_report_util_cmd(cmd); ··· 32 32 else if (cmd >= 0xA0 && cmd <= 0xEF) // Executive cmd 33 33 i2o_report_exec_cmd(cmd); 34 34 else 35 - printk(KERN_DEBUG "Cmd = %0#2x, ", cmd); // Other cmds 35 + printk("Cmd = %0#2x, ", cmd); // Other cmds 36 36 37 37 if (msg[0] & MSG_FAIL) { 38 38 i2o_report_fail_status(req_status, msg); ··· 44 44 if (cmd < 0x1F || (cmd >= 0xA0 && cmd <= 0xEF)) 45 45 i2o_report_common_dsc(detailed_status); 46 46 else 47 - printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n", 47 + printk(" / DetailedStatus = %0#4x.\n", 48 48 detailed_status); 49 49 } 50 50 ··· 89 89 }; 90 90 91 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 93 req_status); 94 94 else 95 - printk(KERN_DEBUG "TRANSPORT_%s.\n", 95 + printk("TRANSPORT_%s.\n", 96 96 FAIL_STATUS[req_status & 0x0F]); 97 97 98 98 /* Dump some details */ ··· 104 104 printk(KERN_ERR " FailingHostUnit = 0x%04X, FailingIOP = 0x%03X\n", 105 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 108 if (msg[4] & (1 << 16)) 109 109 printk(KERN_DEBUG "(FormatError), " 110 110 "this msg can never be delivered/processed.\n"); ··· 142 142 }; 143 143 144 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 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 187 }; 188 188 189 189 if (detailed_status > I2O_DSC_DEVICE_NOT_AVAILABLE) 190 - printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n", 190 + printk(" / DetailedStatus = %0#4x.\n", 191 191 detailed_status); 192 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 200 { 201 201 switch (cmd) { 202 202 case I2O_CMD_UTIL_NOP: 203 - printk(KERN_DEBUG "UTIL_NOP, "); 203 + printk("UTIL_NOP, "); 204 204 break; 205 205 case I2O_CMD_UTIL_ABORT: 206 - printk(KERN_DEBUG "UTIL_ABORT, "); 206 + printk("UTIL_ABORT, "); 207 207 break; 208 208 case I2O_CMD_UTIL_CLAIM: 209 - printk(KERN_DEBUG "UTIL_CLAIM, "); 209 + printk("UTIL_CLAIM, "); 210 210 break; 211 211 case I2O_CMD_UTIL_RELEASE: 212 - printk(KERN_DEBUG "UTIL_CLAIM_RELEASE, "); 212 + printk("UTIL_CLAIM_RELEASE, "); 213 213 break; 214 214 case I2O_CMD_UTIL_CONFIG_DIALOG: 215 - printk(KERN_DEBUG "UTIL_CONFIG_DIALOG, "); 215 + printk("UTIL_CONFIG_DIALOG, "); 216 216 break; 217 217 case I2O_CMD_UTIL_DEVICE_RESERVE: 218 - printk(KERN_DEBUG "UTIL_DEVICE_RESERVE, "); 218 + printk("UTIL_DEVICE_RESERVE, "); 219 219 break; 220 220 case I2O_CMD_UTIL_DEVICE_RELEASE: 221 - printk(KERN_DEBUG "UTIL_DEVICE_RELEASE, "); 221 + printk("UTIL_DEVICE_RELEASE, "); 222 222 break; 223 223 case I2O_CMD_UTIL_EVT_ACK: 224 - printk(KERN_DEBUG "UTIL_EVENT_ACKNOWLEDGE, "); 224 + printk("UTIL_EVENT_ACKNOWLEDGE, "); 225 225 break; 226 226 case I2O_CMD_UTIL_EVT_REGISTER: 227 - printk(KERN_DEBUG "UTIL_EVENT_REGISTER, "); 227 + printk("UTIL_EVENT_REGISTER, "); 228 228 break; 229 229 case I2O_CMD_UTIL_LOCK: 230 - printk(KERN_DEBUG "UTIL_LOCK, "); 230 + printk("UTIL_LOCK, "); 231 231 break; 232 232 case I2O_CMD_UTIL_LOCK_RELEASE: 233 - printk(KERN_DEBUG "UTIL_LOCK_RELEASE, "); 233 + printk("UTIL_LOCK_RELEASE, "); 234 234 break; 235 235 case I2O_CMD_UTIL_PARAMS_GET: 236 - printk(KERN_DEBUG "UTIL_PARAMS_GET, "); 236 + printk("UTIL_PARAMS_GET, "); 237 237 break; 238 238 case I2O_CMD_UTIL_PARAMS_SET: 239 - printk(KERN_DEBUG "UTIL_PARAMS_SET, "); 239 + printk("UTIL_PARAMS_SET, "); 240 240 break; 241 241 case I2O_CMD_UTIL_REPLY_FAULT_NOTIFY: 242 - printk(KERN_DEBUG "UTIL_REPLY_FAULT_NOTIFY, "); 242 + printk("UTIL_REPLY_FAULT_NOTIFY, "); 243 243 break; 244 244 default: 245 - printk(KERN_DEBUG "Cmd = %0#2x, ", cmd); 245 + printk("Cmd = %0#2x, ", cmd); 246 246 } 247 247 } 248 248 ··· 253 253 { 254 254 switch (cmd) { 255 255 case I2O_CMD_ADAPTER_ASSIGN: 256 - printk(KERN_DEBUG "EXEC_ADAPTER_ASSIGN, "); 256 + printk("EXEC_ADAPTER_ASSIGN, "); 257 257 break; 258 258 case I2O_CMD_ADAPTER_READ: 259 - printk(KERN_DEBUG "EXEC_ADAPTER_READ, "); 259 + printk("EXEC_ADAPTER_READ, "); 260 260 break; 261 261 case I2O_CMD_ADAPTER_RELEASE: 262 - printk(KERN_DEBUG "EXEC_ADAPTER_RELEASE, "); 262 + printk("EXEC_ADAPTER_RELEASE, "); 263 263 break; 264 264 case I2O_CMD_BIOS_INFO_SET: 265 - printk(KERN_DEBUG "EXEC_BIOS_INFO_SET, "); 265 + printk("EXEC_BIOS_INFO_SET, "); 266 266 break; 267 267 case I2O_CMD_BOOT_DEVICE_SET: 268 - printk(KERN_DEBUG "EXEC_BOOT_DEVICE_SET, "); 268 + printk("EXEC_BOOT_DEVICE_SET, "); 269 269 break; 270 270 case I2O_CMD_CONFIG_VALIDATE: 271 - printk(KERN_DEBUG "EXEC_CONFIG_VALIDATE, "); 271 + printk("EXEC_CONFIG_VALIDATE, "); 272 272 break; 273 273 case I2O_CMD_CONN_SETUP: 274 - printk(KERN_DEBUG "EXEC_CONN_SETUP, "); 274 + printk("EXEC_CONN_SETUP, "); 275 275 break; 276 276 case I2O_CMD_DDM_DESTROY: 277 - printk(KERN_DEBUG "EXEC_DDM_DESTROY, "); 277 + printk("EXEC_DDM_DESTROY, "); 278 278 break; 279 279 case I2O_CMD_DDM_ENABLE: 280 - printk(KERN_DEBUG "EXEC_DDM_ENABLE, "); 280 + printk("EXEC_DDM_ENABLE, "); 281 281 break; 282 282 case I2O_CMD_DDM_QUIESCE: 283 - printk(KERN_DEBUG "EXEC_DDM_QUIESCE, "); 283 + printk("EXEC_DDM_QUIESCE, "); 284 284 break; 285 285 case I2O_CMD_DDM_RESET: 286 - printk(KERN_DEBUG "EXEC_DDM_RESET, "); 286 + printk("EXEC_DDM_RESET, "); 287 287 break; 288 288 case I2O_CMD_DDM_SUSPEND: 289 - printk(KERN_DEBUG "EXEC_DDM_SUSPEND, "); 289 + printk("EXEC_DDM_SUSPEND, "); 290 290 break; 291 291 case I2O_CMD_DEVICE_ASSIGN: 292 - printk(KERN_DEBUG "EXEC_DEVICE_ASSIGN, "); 292 + printk("EXEC_DEVICE_ASSIGN, "); 293 293 break; 294 294 case I2O_CMD_DEVICE_RELEASE: 295 - printk(KERN_DEBUG "EXEC_DEVICE_RELEASE, "); 295 + printk("EXEC_DEVICE_RELEASE, "); 296 296 break; 297 297 case I2O_CMD_HRT_GET: 298 - printk(KERN_DEBUG "EXEC_HRT_GET, "); 298 + printk("EXEC_HRT_GET, "); 299 299 break; 300 300 case I2O_CMD_ADAPTER_CLEAR: 301 - printk(KERN_DEBUG "EXEC_IOP_CLEAR, "); 301 + printk("EXEC_IOP_CLEAR, "); 302 302 break; 303 303 case I2O_CMD_ADAPTER_CONNECT: 304 - printk(KERN_DEBUG "EXEC_IOP_CONNECT, "); 304 + printk("EXEC_IOP_CONNECT, "); 305 305 break; 306 306 case I2O_CMD_ADAPTER_RESET: 307 - printk(KERN_DEBUG "EXEC_IOP_RESET, "); 307 + printk("EXEC_IOP_RESET, "); 308 308 break; 309 309 case I2O_CMD_LCT_NOTIFY: 310 - printk(KERN_DEBUG "EXEC_LCT_NOTIFY, "); 310 + printk("EXEC_LCT_NOTIFY, "); 311 311 break; 312 312 case I2O_CMD_OUTBOUND_INIT: 313 - printk(KERN_DEBUG "EXEC_OUTBOUND_INIT, "); 313 + printk("EXEC_OUTBOUND_INIT, "); 314 314 break; 315 315 case I2O_CMD_PATH_ENABLE: 316 - printk(KERN_DEBUG "EXEC_PATH_ENABLE, "); 316 + printk("EXEC_PATH_ENABLE, "); 317 317 break; 318 318 case I2O_CMD_PATH_QUIESCE: 319 - printk(KERN_DEBUG "EXEC_PATH_QUIESCE, "); 319 + printk("EXEC_PATH_QUIESCE, "); 320 320 break; 321 321 case I2O_CMD_PATH_RESET: 322 - printk(KERN_DEBUG "EXEC_PATH_RESET, "); 322 + printk("EXEC_PATH_RESET, "); 323 323 break; 324 324 case I2O_CMD_STATIC_MF_CREATE: 325 - printk(KERN_DEBUG "EXEC_STATIC_MF_CREATE, "); 325 + printk("EXEC_STATIC_MF_CREATE, "); 326 326 break; 327 327 case I2O_CMD_STATIC_MF_RELEASE: 328 - printk(KERN_DEBUG "EXEC_STATIC_MF_RELEASE, "); 328 + printk("EXEC_STATIC_MF_RELEASE, "); 329 329 break; 330 330 case I2O_CMD_STATUS_GET: 331 - printk(KERN_DEBUG "EXEC_STATUS_GET, "); 331 + printk("EXEC_STATUS_GET, "); 332 332 break; 333 333 case I2O_CMD_SW_DOWNLOAD: 334 - printk(KERN_DEBUG "EXEC_SW_DOWNLOAD, "); 334 + printk("EXEC_SW_DOWNLOAD, "); 335 335 break; 336 336 case I2O_CMD_SW_UPLOAD: 337 - printk(KERN_DEBUG "EXEC_SW_UPLOAD, "); 337 + printk("EXEC_SW_UPLOAD, "); 338 338 break; 339 339 case I2O_CMD_SW_REMOVE: 340 - printk(KERN_DEBUG "EXEC_SW_REMOVE, "); 340 + printk("EXEC_SW_REMOVE, "); 341 341 break; 342 342 case I2O_CMD_SYS_ENABLE: 343 - printk(KERN_DEBUG "EXEC_SYS_ENABLE, "); 343 + printk("EXEC_SYS_ENABLE, "); 344 344 break; 345 345 case I2O_CMD_SYS_MODIFY: 346 - printk(KERN_DEBUG "EXEC_SYS_MODIFY, "); 346 + printk("EXEC_SYS_MODIFY, "); 347 347 break; 348 348 case I2O_CMD_SYS_QUIESCE: 349 - printk(KERN_DEBUG "EXEC_SYS_QUIESCE, "); 349 + printk("EXEC_SYS_QUIESCE, "); 350 350 break; 351 351 case I2O_CMD_SYS_TAB_SET: 352 - printk(KERN_DEBUG "EXEC_SYS_TAB_SET, "); 352 + printk("EXEC_SYS_TAB_SET, "); 353 353 break; 354 354 default: 355 - printk(KERN_DEBUG "Cmd = %#02x, ", cmd); 355 + printk("Cmd = %#02x, ", cmd); 356 356 } 357 357 } 358 358 ··· 361 361 printk(KERN_INFO "%s: State = ", c->name); 362 362 switch (((i2o_status_block *) c->status_block.virt)->iop_state) { 363 363 case 0x01: 364 - printk(KERN_DEBUG "INIT\n"); 364 + printk("INIT\n"); 365 365 break; 366 366 case 0x02: 367 - printk(KERN_DEBUG "RESET\n"); 367 + printk("RESET\n"); 368 368 break; 369 369 case 0x04: 370 - printk(KERN_DEBUG "HOLD\n"); 370 + printk("HOLD\n"); 371 371 break; 372 372 case 0x05: 373 - printk(KERN_DEBUG "READY\n"); 373 + printk("READY\n"); 374 374 break; 375 375 case 0x08: 376 - printk(KERN_DEBUG "OPERATIONAL\n"); 376 + printk("OPERATIONAL\n"); 377 377 break; 378 378 case 0x10: 379 - printk(KERN_DEBUG "FAILED\n"); 379 + printk("FAILED\n"); 380 380 break; 381 381 case 0x11: 382 - printk(KERN_DEBUG "FAULTED\n"); 382 + printk("FAULTED\n"); 383 383 break; 384 384 default: 385 - printk(KERN_DEBUG "%x (unknown !!)\n", 385 + printk("%x (unknown !!)\n", 386 386 ((i2o_status_block *) c->status_block.virt)->iop_state); 387 387 } 388 388 };