Merge "tty: serial: msm: replace iowrite32_rep with writel_relaxed_no_log" (00d42892) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/tty/serial/msm_serial.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1589,6 +1589,7 @@ static void __msm_console_write(struct uart_port port, const char s,
		int j;
		unsigned int num_chars;
		char buf[4] = { 0 };
		const u32 *buffer;

		if (is_uartdm)
		num_chars = min(count - i, (unsigned int)sizeof(buf));
		@@ -1613,7 +1614,8 @@ static void __msm_console_write(struct uart_port port, const char s,
		while (!(msm_read(port, UART_SR) & UART_SR_TX_READY))
		cpu_relax();

		iowrite32_rep(tf, buf, 1);
		buffer = (const u32 *)buf;
		writel_relaxed_no_log(*buffer, tf);
		i += num_chars;
		}
		spin_unlock(&port->lock);