Commit 88c5cbde authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

parport: daisy: Convert DPRINTK to pr_debug 



Use a more common logging style.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20200403134325.11523-4-sudipm.mukherjee@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa3d6e7c

drivers/parport/daisy.c

+6 −17
Original line number Diff line number Diff line
@@ -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);