Commit 46aea0d4 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

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


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

drivers/parport/parport_mfc3.c

+7 −12
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ 
#define MAX_MFC 5



#undef DEBUG

#ifdef DEBUG

#define DPRINTK printk

#else

static inline int DPRINTK(void *nothing, ...) {return 0;}

#endif



static struct parport *this_port[MAX_MFC] = {NULL, };

static volatile int dummy; /* for trigger readds */
@@ -84,7 +79,7 @@ static struct parport_operations pp_mfc3_ops; 


static void mfc3_write_data(struct parport *p, unsigned char data)

{

DPRINTK(KERN_DEBUG "write_data %c\n",data);

	pr_debug("write_data %c\n", data);



	dummy = pia(p)->pprb; /* clears irq bit */

	/* Triggers also /STROBE.*/
@@ -128,13 +123,13 @@ static unsigned char control_mfc3_to_pc(unsigned char control) 


static void mfc3_write_control(struct parport *p, unsigned char control)

{

DPRINTK(KERN_DEBUG "write_control %02x\n",control);

	pr_debug("write_control %02x\n", control);

	pia(p)->ppra = (pia(p)->ppra & 0x1f) | control_pc_to_mfc3(control);

}

	

static unsigned char mfc3_read_control( struct parport *p)

{

DPRINTK(KERN_DEBUG "read_control \n");

	pr_debug("read_control\n");

	return control_mfc3_to_pc(pia(p)->ppra & 0xe0);

}
@@ -142,7 +137,7 @@ static unsigned char mfc3_frob_control( struct parport *p, unsigned char mask, u 
{

	unsigned char old;



DPRINTK(KERN_DEBUG "frob_control mask %02x, value %02x\n",mask,val);

	pr_debug("frob_control mask %02x, value %02x\n", mask, val);

	old = mfc3_read_control(p);

	mfc3_write_control(p, (old & ~mask) ^ val);

	return old;
@@ -171,7 +166,7 @@ static unsigned char mfc3_read_status(struct parport *p) 
	unsigned char status;



	status = status_mfc3_to_pc(pia(p)->ppra & 0x1f);

DPRINTK(KERN_DEBUG "read_status %02x\n", status);

	pr_debug("read_status %02x\n", status);

	return status;

}
@@ -202,7 +197,7 @@ static void mfc3_disable_irq(struct parport *p) 


static void mfc3_data_forward(struct parport *p)

{

	DPRINTK(KERN_DEBUG "forward\n");

	pr_debug("forward\n");

	pia(p)->crb &= ~PIA_DDR; /* make data direction register visible */

	pia(p)->pddrb = 255; /* all pins output */

	pia(p)->crb |= PIA_DDR; /* make data register visible - default */
@@ -210,7 +205,7 @@ static void mfc3_data_forward(struct parport *p) 


static void mfc3_data_reverse(struct parport *p)

{

	DPRINTK(KERN_DEBUG "reverse\n");

	pr_debug("reverse\n");

	pia(p)->crb &= ~PIA_DDR; /* make data direction register visible */

	pia(p)->pddrb = 0; /* all pins input */

	pia(p)->crb |= PIA_DDR; /* make data register visible - default */