Commit 7b399257 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

parport_pc: Convert DPRINTK to pr_debug 



Use a more common logging style.

Miscellanea:

o One message converted from KERN_INFO to KERN_DEBUG

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-7-sudipm.mukherjee@gmail.com


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

drivers/parport/parport_pc.c

+7 −16
Original line number Diff line number Diff line
@@ -87,13 +87,6 @@ 


#undef DEBUG



#ifdef DEBUG

#define DPRINTK  printk

#else

#define DPRINTK(stuff...)

#endif





#define NR_SUPERIOS 3

static struct superio_struct {	/* For Super-IO chips autodetection */

	int io;
@@ -118,7 +111,7 @@ static void frob_econtrol(struct parport *pb, unsigned char m, 
	if (m != 0xff)

		ectr = inb(ECONTROL(pb));



	DPRINTK(KERN_DEBUG "frob_econtrol(%02x,%02x): %02x -> %02x\n",

	pr_debug("frob_econtrol(%02x,%02x): %02x -> %02x\n",

		 m, v, ectr, (ectr & ~m) ^ v);



	outb((ectr & ~m) ^ v, ECONTROL(pb));
@@ -142,7 +135,7 @@ static int change_mode(struct parport *p, int m) 
	unsigned char oecr;

	int mode;



	DPRINTK(KERN_INFO "parport change_mode ECP-ISA to mode 0x%02x\n", m);

	pr_debug("parport change_mode ECP-ISA to mode 0x%02x\n", m);



	if (!priv->ecr) {

		printk(KERN_DEBUG "change_mode: but there's no ECR!\n");
@@ -2295,7 +2288,7 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma, 
	int irq;

	int i;



	DPRINTK(KERN_DEBUG "sio_ite_8872_probe()\n");

	pr_debug("sio_ite_8872_probe()\n");



	/* make sure which one chip */

	for (i = 0; i < 5; i++) {
@@ -2360,11 +2353,9 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma, 
	pci_write_config_dword(pdev, 0x9c,

				ite8872set | (ite8872_irq * 0x11111));



	DPRINTK(KERN_DEBUG "ITE887x: The IRQ is %d.\n", ite8872_irq);

	DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O port is 0x%x.\n",

		 ite8872_lpt);

	DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O porthi is 0x%x.\n",

		 ite8872_lpthi);

	pr_debug("ITE887x: The IRQ is %d\n", ite8872_irq);

	pr_debug("ITE887x: The PARALLEL I/O port is 0x%x\n", ite8872_lpt);

	pr_debug("ITE887x: The PARALLEL I/O porthi is 0x%x\n", ite8872_lpthi);



	/* Let the user (or defaults) steer us away from interrupts */

	irq = ite8872_irq;