Revert "serial: mctrl_gpio: split disable_ms into sync and no_sync APIs"

This reverts commit e6a46719a2 which is
commit 1bd2aad57da95f7f2d2bb52f7ad15c0f4993a685 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I28be8dc4d16e6d15707544c89cc140bd4e905ca8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Documentation/driver-api/serial/driver.rst

@@ -103,4 +103,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO.
 .. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
    :identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
            mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
-           mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync
+           mctrl_gpio_disable_ms

drivers/tty/serial/8250/8250_port.c

@@ -1657,7 +1657,7 @@ static void serial8250_disable_ms(struct uart_port *port)
 	if (up->bugs & UART_BUG_NOMSR)
 		return;
 
-	mctrl_gpio_disable_ms_no_sync(up->gpios);
+	mctrl_gpio_disable_ms(up->gpios);
 
 	up->ier &= ~UART_IER_MSI;
 	serial_port_out(port, UART_IER, up->ier);

drivers/tty/serial/atmel_serial.c

@@ -700,7 +700,7 @@ static void atmel_disable_ms(struct uart_port *port)
 
 	atmel_port->ms_irq_enabled = false;
 
-	mctrl_gpio_disable_ms_no_sync(atmel_port->gpios);
+	mctrl_gpio_disable_ms(atmel_port->gpios);
 
 	if (!mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_CTS))
 		idr |= ATMEL_US_CTSIC;

drivers/tty/serial/imx.c

@@ -1596,7 +1596,7 @@ static void imx_uart_shutdown(struct uart_port *port)
 		imx_uart_dma_exit(sport);
 	}
 
-	mctrl_gpio_disable_ms_sync(sport->gpios);
+	mctrl_gpio_disable_ms(sport->gpios);
 
 	uart_port_lock_irqsave(&sport->port, &flags);
 	ucr2 = imx_uart_readl(sport, UCR2);

drivers/tty/serial/serial_mctrl_gpio.c

@@ -322,7 +322,11 @@ void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
 }
 EXPORT_SYMBOL_GPL(mctrl_gpio_enable_ms);
 
-static void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios, bool sync)
+/**
+ * mctrl_gpio_disable_ms - disable irqs and handling of changes to the ms lines
+ * @gpios: gpios to disable
+ */
+void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
 {
 	enum mctrl_gpio_idx i;
 
@@ -338,34 +342,10 @@ static void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios, bool sync)
 		if (!gpios->irq[i])
 			continue;
 
-		if (sync)
+		disable_irq(gpios->irq[i]);
-			disable_irq(gpios->irq[i]);
-		else
-			disable_irq_nosync(gpios->irq[i]);
 	}
 }
-
+EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms);
-/**
- * mctrl_gpio_disable_ms_sync - disable irqs and handling of changes to the ms
- * lines, and wait for any pending IRQ to be processed
- * @gpios: gpios to disable
- */
-void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios)
-{
-	mctrl_gpio_disable_ms(gpios, true);
-}
-EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms_sync);
-
-/**
- * mctrl_gpio_disable_ms_no_sync - disable irqs and handling of changes to the
- * ms lines, and return immediately
- * @gpios: gpios to disable
- */
-void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios)
-{
-	mctrl_gpio_disable_ms(gpios, false);
-}
-EXPORT_SYMBOL_GPL(mctrl_gpio_disable_ms_no_sync);
 
 void mctrl_gpio_enable_irq_wake(struct mctrl_gpios *gpios)
 {

drivers/tty/serial/serial_mctrl_gpio.h

@@ -87,16 +87,9 @@ void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios);
 void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios);
 
 /*
- * Disable gpio interrupts to report status line changes, and block until
+ * Disable gpio interrupts to report status line changes.
- * any corresponding IRQ is processed
  */
-void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios);
+void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios);
-
-/*
- * Disable gpio interrupts to report status line changes, and return
- * immediately
- */
-void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios);
 
 /*
  * Enable gpio wakeup interrupts to enable wake up source.
@@ -155,11 +148,7 @@ static inline void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios)
 {
 }
 
-static inline void mctrl_gpio_disable_ms_sync(struct mctrl_gpios *gpios)
+static inline void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)
-{
-}
-
-static inline void mctrl_gpio_disable_ms_no_sync(struct mctrl_gpios *gpios)
 {
 }
 

drivers/tty/serial/sh-sci.c

@@ -2309,7 +2309,7 @@ static void sci_shutdown(struct uart_port *port)
 	dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
 
 	s->autorts = false;
-	mctrl_gpio_disable_ms_sync(to_sci_port(port)->gpios);
+	mctrl_gpio_disable_ms(to_sci_port(port)->gpios);
 
 	uart_port_lock_irqsave(port, &flags);
 	sci_stop_rx(port);

drivers/tty/serial/stm32-usart.c

@@ -944,7 +944,7 @@ static void stm32_usart_enable_ms(struct uart_port *port)
 
 static void stm32_usart_disable_ms(struct uart_port *port)
 {
-	mctrl_gpio_disable_ms_sync(to_stm32_port(port)->gpios);
+	mctrl_gpio_disable_ms(to_stm32_port(port)->gpios);
 }
 
 /* Transmit stop */