Merge tag 'io_uring-5.6-2020-02-22' of git://git.kernel.dk/linux-block

[linux.git] / drivers / tty / serial / amba-pl011.c

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 4b28134d596a9d64918aca8877d9f80844c79b03..2296bb0f95787454ec8cbf50f6d5feef3bc7abdb 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -16,11 +16,6 @@
  * and hooked into this driver.
  */
 
-
-#if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
@@ -1452,8 +1447,6 @@ static void pl011_modem_status(struct uart_amba_port *uap)
 
 static void check_apply_cts_event_workaround(struct uart_amba_port *uap)
 {
-       unsigned int dummy_read;
-
        if (!uap->vendor->cts_event_workaround)
                return;
 
@@ -1465,8 +1458,8 @@ static void check_apply_cts_event_workaround(struct uart_amba_port *uap)
         * single apb access will incur 2 pclk(133.12Mhz) delay,
         * so add 2 dummy reads
         */
-       dummy_read = pl011_read(uap, REG_ICR);
-       dummy_read = pl011_read(uap, REG_ICR);
+       pl011_read(uap, REG_ICR);
+       pl011_read(uap, REG_ICR);
 }
 
 static irqreturn_t pl011_int(int irq, void *dev_id)
@@ -2579,6 +2572,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
        uap->port.mapbase = mmiobase->start;
        uap->port.membase = base;
        uap->port.fifosize = uap->fifosize;
+       uap->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_AMBA_PL011_CONSOLE);
        uap->port.flags = UPF_BOOT_AUTOCONF;
        uap->port.line = index;
 
@@ -2769,6 +2763,7 @@ static struct platform_driver arm_sbsa_uart_platform_driver = {
        .remove         = sbsa_uart_remove,
        .driver = {
                .name   = "sbsa-uart",
+               .pm     = &pl011_dev_pm_ops,
                .of_match_table = of_match_ptr(sbsa_uart_of_match),
                .acpi_match_table = ACPI_PTR(sbsa_uart_acpi_match),
                .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011),