p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

via-cuda: Cleanup printk calls 

Add missing log message severity, remove old debug messages and
replace printk() loop with print_hex_dump() call.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Finn Thain 2016-12-31 19:56:26 -05:00 committed by Michael Ellerman
parent a5ecdad484
commit 523717d149
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/macintosh/via-cuda.c
View File

@ -221,7 +221,7 @@ static int __init via_cuda_start(void)
return -EAGAIN; return -EAGAIN;
} }
printk("Macintosh CUDA driver v0.5 for Unified ADB.\n"); pr_info("Macintosh CUDA driver v0.5 for Unified ADB.\n");
cuda_fully_inited = 1; cuda_fully_inited = 1;
return 0; return 0;
@ -251,7 +251,7 @@ cuda_probe(void)
int x; \ int x; \
for (x = 1000; !(cond); --x) { \ for (x = 1000; !(cond); --x) { \
if (x == 0) { \ if (x == 0) { \
printk("Timeout waiting for " what "\n"); \ pr_err("Timeout waiting for " what "\n"); \
return -ENXIO; \ return -ENXIO; \
} \ } \
udelay(100); \ udelay(100); \
@ -357,6 +357,7 @@ cuda_reset_adb_bus(void)
return 0; return 0;
} }
#endif /* CONFIG_ADB */ #endif /* CONFIG_ADB */
/* Construct and send a cuda request */ /* Construct and send a cuda request */
int int
cuda_request(struct adb_request *req, void (*done)(struct adb_request *), cuda_request(struct adb_request *req, void (*done)(struct adb_request *),
@ -474,12 +475,9 @@ cuda_interrupt(int irq, void *arg)
} }
status = (~in_8(&via[B]) & (TIP|TREQ)) | (in_8(&via[ACR]) & SR_OUT); status = (~in_8(&via[B]) & (TIP|TREQ)) | (in_8(&via[ACR]) & SR_OUT);
/* printk("cuda_interrupt: state=%d status=%x\n", cuda_state, status); */
switch (cuda_state) { switch (cuda_state) {
case idle: case idle:
/* CUDA has sent us the first byte of data - unsolicited */ /* CUDA has sent us the first byte of data - unsolicited */
if (status != TREQ)
printk("cuda: state=idle, status=%x\n", status);
(void)in_8(&via[SR]); (void)in_8(&via[SR]);
out_8(&via[B], in_8(&via[B]) & ~TIP); out_8(&via[B], in_8(&via[B]) & ~TIP);
cuda_state = reading; cuda_state = reading;
@ -489,8 +487,6 @@ cuda_interrupt(int irq, void *arg)
case awaiting_reply: case awaiting_reply:
/* CUDA has sent us the first byte of data of a reply */ /* CUDA has sent us the first byte of data of a reply */
if (status != TREQ)
printk("cuda: state=awaiting_reply, status=%x\n", status);
(void)in_8(&via[SR]); (void)in_8(&via[SR]);
out_8(&via[B], in_8(&via[B]) & ~TIP); out_8(&via[B], in_8(&via[B]) & ~TIP);
cuda_state = reading; cuda_state = reading;
@ -506,9 +502,6 @@ cuda_interrupt(int irq, void *arg)
out_8(&via[B], in_8(&via[B]) | TIP | TACK); out_8(&via[B], in_8(&via[B]) | TIP | TACK);
cuda_state = idle; cuda_state = idle;
} else { } else {
/* assert status == TIP + SR_OUT */
if (status != TIP + SR_OUT)
printk("cuda: state=sent_first_byte status=%x\n", status);
out_8(&via[SR], current_req->data[1]); out_8(&via[SR], current_req->data[1]);
out_8(&via[B], in_8(&via[B]) ^ TACK); out_8(&via[B], in_8(&via[B]) ^ TACK);
data_index = 2; data_index = 2;
@ -545,9 +538,6 @@ cuda_interrupt(int irq, void *arg)
out_8(&via[B], in_8(&via[B]) | TACK | TIP); out_8(&via[B], in_8(&via[B]) | TACK | TIP);
cuda_state = read_done; cuda_state = read_done;
} else { } else {
/* assert status == TIP | TREQ */
if (status != TIP + TREQ)
printk("cuda: state=reading status=%x\n", status);
out_8(&via[B], in_8(&via[B]) ^ TACK); out_8(&via[B], in_8(&via[B]) ^ TACK);
} }
break; break;
@ -593,7 +583,7 @@ cuda_interrupt(int irq, void *arg)
break; break;
default: default:
printk("cuda_interrupt: unknown cuda_state %d?\n", cuda_state); pr_err("cuda_interrupt: unknown cuda_state %d?\n", cuda_state);
} }
spin_unlock(&cuda_lock); spin_unlock(&cuda_lock);
if (complete && req) { if (complete && req) {
@ -614,8 +604,6 @@ cuda_interrupt(int irq, void *arg)
static void static void
cuda_input(unsigned char *buf, int nb) cuda_input(unsigned char *buf, int nb)
{ {
int i;
switch (buf[0]) { switch (buf[0]) {
case ADB_PACKET: case ADB_PACKET:
#ifdef CONFIG_XMON #ifdef CONFIG_XMON
@ -633,9 +621,7 @@ cuda_input(unsigned char *buf, int nb)
break; break;
default: default:
printk("data from cuda (%d bytes):", nb); print_hex_dump(KERN_INFO, "cuda_input: ", DUMP_PREFIX_NONE, 32, 1,
for (i = 0; i < nb; ++i) buf, nb, false);
printk(" %.2x", buf[i]);
printk("\n");
} }
} }