Commit 45a272bc authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

parport_amiga: 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-5-sudipm.mukherjee@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88c5cbde
...@@ -28,16 +28,10 @@ ...@@ -28,16 +28,10 @@
#include <asm/amigaints.h> #include <asm/amigaints.h>
#undef DEBUG #undef DEBUG
#ifdef DEBUG
#define DPRINTK printk
#else
#define DPRINTK(x...) do { } while (0)
#endif
static void amiga_write_data(struct parport *p, unsigned char data) static void amiga_write_data(struct parport *p, unsigned char data)
{ {
DPRINTK(KERN_DEBUG "write_data %c\n",data); pr_debug("write_data %c\n", data);
/* Triggers also /STROBE. This behavior cannot be changed */ /* Triggers also /STROBE. This behavior cannot be changed */
ciaa.prb = data; ciaa.prb = data;
mb(); mb();
...@@ -59,13 +53,13 @@ static unsigned char control_amiga_to_pc(unsigned char control) ...@@ -59,13 +53,13 @@ static unsigned char control_amiga_to_pc(unsigned char control)
static void amiga_write_control(struct parport *p, unsigned char control) static void amiga_write_control(struct parport *p, unsigned char control)
{ {
DPRINTK(KERN_DEBUG "write_control %02x\n",control); pr_debug("write_control %02x\n", control);
/* No implementation possible */ /* No implementation possible */
} }
static unsigned char amiga_read_control( struct parport *p) static unsigned char amiga_read_control( struct parport *p)
{ {
DPRINTK(KERN_DEBUG "read_control \n"); pr_debug("read_control\n");
return control_amiga_to_pc(0); return control_amiga_to_pc(0);
} }
...@@ -73,7 +67,7 @@ static unsigned char amiga_frob_control( struct parport *p, unsigned char mask, ...@@ -73,7 +67,7 @@ static unsigned char amiga_frob_control( struct parport *p, unsigned char mask,
{ {
unsigned char old; 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 = amiga_read_control(p); old = amiga_read_control(p);
amiga_write_control(p, (old & ~mask) ^ val); amiga_write_control(p, (old & ~mask) ^ val);
return old; return old;
...@@ -99,7 +93,7 @@ static unsigned char amiga_read_status(struct parport *p) ...@@ -99,7 +93,7 @@ static unsigned char amiga_read_status(struct parport *p)
unsigned char status; unsigned char status;
status = status_amiga_to_pc(ciab.pra & 7); status = status_amiga_to_pc(ciab.pra & 7);
DPRINTK(KERN_DEBUG "read_status %02x\n", status); pr_debug("read_status %02x\n", status);
return status; return status;
} }
...@@ -115,14 +109,14 @@ static void amiga_disable_irq(struct parport *p) ...@@ -115,14 +109,14 @@ static void amiga_disable_irq(struct parport *p)
static void amiga_data_forward(struct parport *p) static void amiga_data_forward(struct parport *p)
{ {
DPRINTK(KERN_DEBUG "forward\n"); pr_debug("forward\n");
ciaa.ddrb = 0xff; /* all pins output */ ciaa.ddrb = 0xff; /* all pins output */
mb(); mb();
} }
static void amiga_data_reverse(struct parport *p) static void amiga_data_reverse(struct parport *p)
{ {
DPRINTK(KERN_DEBUG "reverse\n"); pr_debug("reverse\n");
ciaa.ddrb = 0; /* all pins input */ ciaa.ddrb = 0; /* all pins input */
mb(); mb();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment