[SERIAL] uart_port flags member should use UPF_*

Convert usage of ASYNC_* to UPF_*.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

8 files changed, 8 insertions, 8 deletions

diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c
index c371d54d2552..0ec53f049338 100644
--- a/arch/ppc/platforms/4xx/bamboo.c
+++ b/arch/ppc/platforms/4xx/bamboo.c
@@ -333,7 +333,7 @@ bamboo_early_serial_map(void)
         port.uartclk = clocks.uart0;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c
index 0fe8da1401da..ce48a4f08cbb 100644
--- a/arch/ppc/platforms/4xx/bubinga.c
+++ b/arch/ppc/platforms/4xx/bubinga.c
@@ -98,7 +98,7 @@ bubinga_early_serial_map(void)
         port.uartclk = uart_clock;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 352b76c08987..9a828b623417 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -226,7 +226,7 @@ ebony_early_serial_map(void)
         port.uartclk = clocks.uart0;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c
index a94683a72a1e..21d29132aebd 100644
--- a/arch/ppc/platforms/4xx/luan.c
+++ b/arch/ppc/platforms/4xx/luan.c
@@ -280,7 +280,7 @@ luan_early_serial_map(void)
         port.uartclk = clocks.uart0;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index de916bb4617c..4f355b6acab2 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -249,7 +249,7 @@ ocotea_early_serial_map(void)
         port.uartclk = clocks.uart0;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c
index 3f820229071e..e90d97f64f76 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -96,7 +96,7 @@ ml300_early_serial_map(void)
                 port.uartclk = old_ports[i].baud_base * 16;
                 port.regshift = old_ports[i].iomem_reg_shift;
                 port.iotype = UPIO_MEM;
-                port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+                port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
                 port.line = i;
 
                 if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c
index 2b84fc6247d3..b065b8babcd3 100644
--- a/arch/ppc/platforms/4xx/yucca.c
+++ b/arch/ppc/platforms/4xx/yucca.c
@@ -306,7 +306,7 @@ yucca_early_serial_map(void)
         port.uartclk = clocks.uart0;
         port.regshift = 0;
         port.iotype = UPIO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c
index 510182ea9d28..69e1de7971f2 100644
--- a/arch/ppc/platforms/spruce.c
+++ b/arch/ppc/platforms/spruce.c
@@ -176,7 +176,7 @@ spruce_early_serial_map(void)
         memset(&serial_req, 0, sizeof(serial_req));
         serial_req.uartclk = uart_clk;
         serial_req.irq = UART0_INT;
-        serial_req.flags = ASYNC_BOOT_AUTOCONF;
+        serial_req.flags = UPF_BOOT_AUTOCONF;
         serial_req.iotype = UPIO_MEM;
         serial_req.membase = (u_char *)UART0_IO_BASE;
         serial_req.regshift = 0;