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>

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