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

parport: daisy: Convert DPRINTK to pr_debug

Use a more common logging style.

Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20200403134325.11523-4-sudipm.mukherjee@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
88c5cbde aa3d6e7c

+6 -17
+6 -17
drivers/parport/daisy.c
··· 30 30 31 31 #undef DEBUG 32 32 33 - #ifdef DEBUG 34 - #define DPRINTK(stuff...) printk(stuff) 35 - #else 36 - #define DPRINTK(stuff...) 37 - #endif 38 - 39 33 static struct daisydev { 40 34 struct daisydev *next; 41 35 struct parport *port; ··· 315 321 | PARPORT_STATUS_PAPEROUT 316 322 | PARPORT_STATUS_SELECT 317 323 | PARPORT_STATUS_ERROR)) { 318 - DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n", 319 - port->name, s); 324 + pr_debug("%s: cpp_daisy: aa5500ff(%02x)\n", port->name, s); 320 325 return -ENXIO; 321 326 } 322 327 ··· 325 332 | PARPORT_STATUS_SELECT 326 333 | PARPORT_STATUS_ERROR); 327 334 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 328 - DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n", 329 - port->name, s); 335 + pr_debug("%s: cpp_daisy: aa5500ff87(%02x)\n", port->name, s); 330 336 return -ENXIO; 331 337 } 332 338 ··· 360 368 361 369 s = parport_read_status(port); 362 370 if (!(s & PARPORT_STATUS_ACK)) { 363 - DPRINTK(KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n", 371 + pr_debug("%s: cpp_mux: aa55f00f52ad%02x(%02x)\n", 364 372 port->name, cmd, s); 365 373 return -EIO; 366 374 } ··· 446 454 | PARPORT_STATUS_PAPEROUT 447 455 | PARPORT_STATUS_SELECT 448 456 | PARPORT_STATUS_ERROR)) { 449 - DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n", 450 - port->name, s); 457 + pr_debug("%s: assign_addrs: aa5500ff(%02x)\n", port->name, s); 451 458 return 0; 452 459 } 453 460 ··· 456 465 | PARPORT_STATUS_SELECT 457 466 | PARPORT_STATUS_ERROR); 458 467 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 459 - DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n", 460 - port->name, s); 468 + pr_debug("%s: assign_addrs: aa5500ff87(%02x)\n", port->name, s); 461 469 return 0; 462 470 } 463 471 ··· 493 503 494 504 parport_write_data(port, 0xff); udelay(2); 495 505 detected = numdevs - thisdev; 496 - DPRINTK(KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name, 497 - detected); 506 + pr_debug("%s: Found %d daisy-chained devices\n", port->name, detected); 498 507 499 508 /* Ask the new devices to introduce themselves. */ 500 509 deviceid = kmalloc(1024, GFP_KERNEL);