leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parport: daisy: Convert DPRINTK to pr_debug

Browse Source 
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>
This commit is contained in:
Joe Perches 2020-04-03 14:43:18 +01:00 committed by Greg Kroah-Hartman
parent aa3d6e7c49
commit 88c5cbdef8
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/parport/daisy.c
View File

@ -30,12 +30,6 @@
#undef DEBUG #undef DEBUG
#ifdef DEBUG
#define DPRINTK(stuff...) printk(stuff)
#else
#define DPRINTK(stuff...)
#endif
static struct daisydev { static struct daisydev {
struct daisydev *next; struct daisydev *next;
struct parport *port; struct parport *port;
@ -321,8 +315,7 @@ static int cpp_daisy(struct parport *port, int cmd)
| PARPORT_STATUS_PAPEROUT | PARPORT_STATUS_PAPEROUT
| PARPORT_STATUS_SELECT | PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR)) { | PARPORT_STATUS_ERROR)) {
DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n", pr_debug("%s: cpp_daisy: aa5500ff(%02x)\n", port->name, s);
port->name, s);
return -ENXIO; return -ENXIO;
} }
@ -332,8 +325,7 @@ static int cpp_daisy(struct parport *port, int cmd)
| PARPORT_STATUS_SELECT | PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR); | PARPORT_STATUS_ERROR);
if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n", pr_debug("%s: cpp_daisy: aa5500ff87(%02x)\n", port->name, s);
port->name, s);
return -ENXIO; return -ENXIO;
} }
@ -368,7 +360,7 @@ static int cpp_mux(struct parport *port, int cmd)
s = parport_read_status(port); s = parport_read_status(port);
if (!(s & PARPORT_STATUS_ACK)) { if (!(s & PARPORT_STATUS_ACK)) {
DPRINTK(KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n", pr_debug("%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
port->name, cmd, s); port->name, cmd, s);
return -EIO; return -EIO;
} }
@ -454,8 +446,7 @@ static int assign_addrs(struct parport *port)
| PARPORT_STATUS_PAPEROUT | PARPORT_STATUS_PAPEROUT
| PARPORT_STATUS_SELECT | PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR)) { | PARPORT_STATUS_ERROR)) {
DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n", pr_debug("%s: assign_addrs: aa5500ff(%02x)\n", port->name, s);
port->name, s);
return 0; return 0;
} }
@ -465,8 +456,7 @@ static int assign_addrs(struct parport *port)
| PARPORT_STATUS_SELECT | PARPORT_STATUS_SELECT
| PARPORT_STATUS_ERROR); | PARPORT_STATUS_ERROR);
if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n", pr_debug("%s: assign_addrs: aa5500ff87(%02x)\n", port->name, s);
port->name, s);
return 0; return 0;
} }
@ -503,8 +493,7 @@ static int assign_addrs(struct parport *port)
parport_write_data(port, 0xff); udelay(2); parport_write_data(port, 0xff); udelay(2);
detected = numdevs - thisdev; detected = numdevs - thisdev;
DPRINTK(KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name, pr_debug("%s: Found %d daisy-chained devices\n", port->name, detected);
detected);
/* Ask the new devices to introduce themselves. */ /* Ask the new devices to introduce themselves. */
deviceid = kmalloc(1024, GFP_KERNEL); deviceid = kmalloc(1024, GFP_KERNEL);