No one uses it anymore as it is sufficient to check prior to writing for the state of the UART.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm-common/dbg-write.c | 1 - hypervisor/arch/arm-common/include/asm/uart-pl011.h | 4 ---- hypervisor/arch/arm-common/include/asm/uart.h | 1 - hypervisor/arch/arm-common/uart-pl011.c | 1 - hypervisor/arch/arm/include/asm/uart-8250-dw.h | 4 ---- hypervisor/arch/arm/include/asm/uart-tegra.h | 4 ---- hypervisor/arch/arm/uart-8250-dw.c | 1 - hypervisor/arch/arm/uart-tegra.c | 1 - inmates/lib/arm/printk.c | 1 - inmates/lib/arm/uart-8250-dw.c | 1 - inmates/lib/arm/uart-pl011.c | 1 - inmates/lib/arm/uart-tegra.c | 1 - 12 files changed, 21 deletions(-) diff --git a/hypervisor/arch/arm-common/dbg-write.c b/hypervisor/arch/arm-common/dbg-write.c index c89b2df..5010d73 100644 --- a/hypervisor/arch/arm-common/dbg-write.c +++ b/hypervisor/arch/arm-common/dbg-write.c @@ -42,6 +42,5 @@ void arch_dbg_write(const char *msg) if (panic_in_progress && panic_cpu != phys_processor_id()) break; uart.write(&uart, c); - uart.busy(&uart); } } diff --git a/hypervisor/arch/arm-common/include/asm/uart-pl011.h b/hypervisor/arch/arm-common/include/asm/uart-pl011.h index a4048b4..06d1f3a 100644 --- a/hypervisor/arch/arm-common/include/asm/uart-pl011.h +++ b/hypervisor/arch/arm-common/include/asm/uart-pl011.h @@ -65,10 +65,6 @@ static void uart_wait(struct uart_chip *chip) } while (flags & (UARTFR_TXFF | UARTFR_BUSY)); /* FIFO full or busy */ } -static void uart_busy(struct uart_chip *chip) -{ -} - static void uart_write(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UARTDR, c); diff --git a/hypervisor/arch/arm-common/include/asm/uart.h b/hypervisor/arch/arm-common/include/asm/uart.h index 8bcb242..b516230 100644 --- a/hypervisor/arch/arm-common/include/asm/uart.h +++ b/hypervisor/arch/arm-common/include/asm/uart.h @@ -20,7 +20,6 @@ struct uart_chip { void *virt_base; void (*wait)(struct uart_chip *); - void (*busy)(struct uart_chip *); void (*write)(struct uart_chip *, char c); void *clock_reg; diff --git a/hypervisor/arch/arm-common/uart-pl011.c b/hypervisor/arch/arm-common/uart-pl011.c index 6fc9495..d3e9a2f 100644 --- a/hypervisor/arch/arm-common/uart-pl011.c +++ b/hypervisor/arch/arm-common/uart-pl011.c @@ -16,7 +16,6 @@ void uart_chip_init(struct uart_chip *chip) { chip->wait = uart_wait; - chip->busy = uart_busy; chip->write = uart_write; uart_init(chip); diff --git a/hypervisor/arch/arm/include/asm/uart-8250-dw.h b/hypervisor/arch/arm/include/asm/uart-8250-dw.h index a06923a..6930f58 100644 --- a/hypervisor/arch/arm/include/asm/uart-8250-dw.h +++ b/hypervisor/arch/arm/include/asm/uart-8250-dw.h @@ -42,10 +42,6 @@ static void uart_wait(struct uart_chip *chip) cpu_relax(); } -static void uart_busy(struct uart_chip *chip) -{ -} - static void uart_write(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UART_TX, c); diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm/include/asm/uart-tegra.h index ecac543..d40274e 100644 --- a/hypervisor/arch/arm/include/asm/uart-tegra.h +++ b/hypervisor/arch/arm/include/asm/uart-tegra.h @@ -34,10 +34,6 @@ static void uart_wait(struct uart_chip *chip) cpu_relax(); } -static void uart_busy(struct uart_chip *chip) -{ -} - static void uart_write(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UART_TX, c); diff --git a/hypervisor/arch/arm/uart-8250-dw.c b/hypervisor/arch/arm/uart-8250-dw.c index 4b2ada9..3f07d70 100644 --- a/hypervisor/arch/arm/uart-8250-dw.c +++ b/hypervisor/arch/arm/uart-8250-dw.c @@ -18,7 +18,6 @@ void uart_chip_init(struct uart_chip *chip) { chip->wait = uart_wait; - chip->busy = uart_busy; chip->write = uart_write; uart_init(chip); diff --git a/hypervisor/arch/arm/uart-tegra.c b/hypervisor/arch/arm/uart-tegra.c index 634523e..504631e 100644 --- a/hypervisor/arch/arm/uart-tegra.c +++ b/hypervisor/arch/arm/uart-tegra.c @@ -18,7 +18,6 @@ void uart_chip_init(struct uart_chip *chip) { chip->wait = uart_wait; - chip->busy = uart_busy; chip->write = uart_write; uart_init(chip); diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm/printk.c index 3ede5cf..73de356 100644 --- a/inmates/lib/arm/printk.c +++ b/inmates/lib/arm/printk.c @@ -30,7 +30,6 @@ static void console_write(const char *msg) chip.wait(&chip); chip.write(&chip, c); - chip.busy(&chip); } } diff --git a/inmates/lib/arm/uart-8250-dw.c b/inmates/lib/arm/uart-8250-dw.c index fc04c74..5df2de2 100644 --- a/inmates/lib/arm/uart-8250-dw.c +++ b/inmates/lib/arm/uart-8250-dw.c @@ -19,7 +19,6 @@ void uart_chip_init(struct uart_chip *chip) chip->virt_base = UART_BASE; chip->wait = uart_wait; chip->write = uart_write; - chip->busy = uart_busy; chip->clock_reg = UART_CLOCK_REG; chip->gate_nr = UART_GATE_NR; uart_init(chip); diff --git a/inmates/lib/arm/uart-pl011.c b/inmates/lib/arm/uart-pl011.c index 98fcc09..48b1dee 100644 --- a/inmates/lib/arm/uart-pl011.c +++ b/inmates/lib/arm/uart-pl011.c @@ -17,6 +17,5 @@ void uart_chip_init(struct uart_chip *chip) chip->virt_base = UART_BASE; chip->wait = uart_wait; chip->write = uart_write; - chip->busy = uart_busy; uart_init(chip); } diff --git a/inmates/lib/arm/uart-tegra.c b/inmates/lib/arm/uart-tegra.c index 6506195..342667c 100644 --- a/inmates/lib/arm/uart-tegra.c +++ b/inmates/lib/arm/uart-tegra.c @@ -19,6 +19,5 @@ void uart_chip_init(struct uart_chip *chip) chip->virt_base = UART_BASE; chip->wait = uart_wait; chip->write = uart_write; - chip->busy = uart_busy; uart_init(chip); } -- 2.1.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
