Commit c83a34a5 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

serial: pmac_zilog: remove tracing prints

Remove debug printouts upon function enter/exit. This can be achieved
better by tracing.

Remove also the one protected by DEBUG_HARD which is not defined anyway.

Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220519075653.31356-3-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae1de093
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
*/ */
#undef DEBUG #undef DEBUG
#undef DEBUG_HARD
#undef USE_CTRL_O_SYSRQ #undef USE_CTRL_O_SYSRQ
#include <linux/module.h> #include <linux/module.h>
...@@ -442,9 +441,6 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id) ...@@ -442,9 +441,6 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
spin_lock(&uap_a->port.lock); spin_lock(&uap_a->port.lock);
r3 = read_zsreg(uap_a, R3); r3 = read_zsreg(uap_a, R3);
#ifdef DEBUG_HARD
pmz_debug("irq, r3: %x\n", r3);
#endif
/* Channel A */ /* Channel A */
push = false; push = false;
if (r3 & (CHAEXT | CHATxIP | CHARxIP)) { if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
...@@ -609,8 +605,6 @@ static void pmz_start_tx(struct uart_port *port) ...@@ -609,8 +605,6 @@ static void pmz_start_tx(struct uart_port *port)
struct uart_pmac_port *uap = to_pmz(port); struct uart_pmac_port *uap = to_pmz(port);
unsigned char status; unsigned char status;
pmz_debug("pmz: start_tx()\n");
uap->flags |= PMACZILOG_FLAG_TX_ACTIVE; uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
uap->flags &= ~PMACZILOG_FLAG_TX_STOPPED; uap->flags &= ~PMACZILOG_FLAG_TX_STOPPED;
...@@ -632,7 +626,7 @@ static void pmz_start_tx(struct uart_port *port) ...@@ -632,7 +626,7 @@ static void pmz_start_tx(struct uart_port *port)
struct circ_buf *xmit = &port->state->xmit; struct circ_buf *xmit = &port->state->xmit;
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
goto out; return;
write_zsdata(uap, xmit->buf[xmit->tail]); write_zsdata(uap, xmit->buf[xmit->tail]);
zssync(uap); zssync(uap);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
...@@ -641,8 +635,6 @@ static void pmz_start_tx(struct uart_port *port) ...@@ -641,8 +635,6 @@ static void pmz_start_tx(struct uart_port *port)
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(&uap->port); uart_write_wakeup(&uap->port);
} }
out:
pmz_debug("pmz: start_tx() done.\n");
} }
/* /*
...@@ -655,13 +647,9 @@ static void pmz_stop_rx(struct uart_port *port) ...@@ -655,13 +647,9 @@ static void pmz_stop_rx(struct uart_port *port)
{ {
struct uart_pmac_port *uap = to_pmz(port); struct uart_pmac_port *uap = to_pmz(port);
pmz_debug("pmz: stop_rx()()\n");
/* Disable all RX interrupts. */ /* Disable all RX interrupts. */
uap->curregs[R1] &= ~RxINT_MASK; uap->curregs[R1] &= ~RxINT_MASK;
pmz_maybe_update_regs(uap); pmz_maybe_update_regs(uap);
pmz_debug("pmz: stop_rx() done.\n");
} }
/* /*
...@@ -906,8 +894,6 @@ static int pmz_startup(struct uart_port *port) ...@@ -906,8 +894,6 @@ static int pmz_startup(struct uart_port *port)
unsigned long flags; unsigned long flags;
int pwr_delay = 0; int pwr_delay = 0;
pmz_debug("pmz: startup()\n");
uap->flags |= PMACZILOG_FLAG_IS_OPEN; uap->flags |= PMACZILOG_FLAG_IS_OPEN;
/* A console is never powered down. Else, power up and /* A console is never powered down. Else, power up and
...@@ -943,8 +929,6 @@ static int pmz_startup(struct uart_port *port) ...@@ -943,8 +929,6 @@ static int pmz_startup(struct uart_port *port)
pmz_interrupt_control(uap, 1); pmz_interrupt_control(uap, 1);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
pmz_debug("pmz: startup() done.\n");
return 0; return 0;
} }
...@@ -953,8 +937,6 @@ static void pmz_shutdown(struct uart_port *port) ...@@ -953,8 +937,6 @@ static void pmz_shutdown(struct uart_port *port)
struct uart_pmac_port *uap = to_pmz(port); struct uart_pmac_port *uap = to_pmz(port);
unsigned long flags; unsigned long flags;
pmz_debug("pmz: shutdown()\n");
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
/* Disable interrupt requests for the channel */ /* Disable interrupt requests for the channel */
...@@ -983,8 +965,6 @@ static void pmz_shutdown(struct uart_port *port) ...@@ -983,8 +965,6 @@ static void pmz_shutdown(struct uart_port *port)
pmz_set_scc_power(uap, 0); /* Shut the chip down */ pmz_set_scc_power(uap, 0); /* Shut the chip down */
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
pmz_debug("pmz: shutdown() done.\n");
} }
/* Shared by TTY driver and serial console setup. The port lock is held /* Shared by TTY driver and serial console setup. The port lock is held
...@@ -1229,8 +1209,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1229,8 +1209,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
struct uart_pmac_port *uap = to_pmz(port); struct uart_pmac_port *uap = to_pmz(port);
unsigned long baud; unsigned long baud;
pmz_debug("pmz: set_termios()\n");
/* XXX Check which revs of machines actually allow 1 and 4Mb speeds /* XXX Check which revs of machines actually allow 1 and 4Mb speeds
* on the IR dongle. Note that the IRTTY driver currently doesn't know * on the IR dongle. Note that the IRTTY driver currently doesn't know
* about the FIR mode and high speed modes. So these are unused. For * about the FIR mode and high speed modes. So these are unused. For
...@@ -1264,8 +1242,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1264,8 +1242,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
pmz_maybe_update_regs(uap); pmz_maybe_update_regs(uap);
} }
uart_update_timeout(port, termios->c_cflag, baud); uart_update_timeout(port, termios->c_cflag, baud);
pmz_debug("pmz: set_termios() done.\n");
} }
/* The port lock is not held. */ /* The port lock is not held. */
......
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