[SERIAL] Don't use ASYNC_ constants with the uart_port structure (ce8337cb) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/serial/21285.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,7 @@ static struct uart_port serial21285_port = {
	.irq = NO_IRQ,		.irq = NO_IRQ,
	.fifosize = 16,		.fifosize = 16,
	.ops = &serial21285_ops,		.ops = &serial21285_ops,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	};		};

	static void serial21285_setup_ports(void)		static void serial21285_setup_ports(void)

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -566,7 +566,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
	.uartclk = 14745600,		.uartclk = 14745600,
	.fifosize = 16,		.fifosize = 16,
	.ops = &amba_pl010_pops,		.ops = &amba_pl010_pops,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	.line = 0,		.line = 0,
	},		},
	.dtr_mask = 1 << 5,		.dtr_mask = 1 << 5,
	@@ -581,7 +581,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
	.uartclk = 14745600,		.uartclk = 14745600,
	.fifosize = 16,		.fifosize = 16,
	.ops = &amba_pl010_pops,		.ops = &amba_pl010_pops,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	.line = 1,		.line = 1,
	},		},
	.dtr_mask = 1 << 7,		.dtr_mask = 1 << 7,

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
	.fifosize = 16,		.fifosize = 16,
	.ops = &clps711x_pops,		.ops = &clps711x_pops,
	.line = 0,		.line = 0,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	},		},
	{		{
	.iobase = SYSCON2,		.iobase = SYSCON2,
	@@ -419,7 +419,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
	.fifosize = 16,		.fifosize = 16,
	.ops = &clps711x_pops,		.ops = &clps711x_pops,
	.line = 1,		.line = 1,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	}		}
	};		};

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = {
	.irq = UART1_MINT_RX,		.irq = UART1_MINT_RX,
	.uartclk = 16000000,		.uartclk = 16000000,
	.fifosize = 8,		.fifosize = 8,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	.ops = &imx_pops,		.ops = &imx_pops,
	.line = 0,		.line = 0,
	},		},
	@@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = {
	.irq = UART2_MINT_RX,		.irq = UART2_MINT_RX,
	.uartclk = 16000000,		.uartclk = 16000000,
	.fifosize = 8,		.fifosize = 8,
	.flags = ASYNC_BOOT_AUTOCONF,		.flags = UPF_BOOT_AUTOCONF,
	.ops = &imx_pops,		.ops = &imx_pops,
	.line = 1,		.line = 1,
	},		},

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -665,21 +665,21 @@ void __init sa1100_register_uart(int idx, int port)
	sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0;		sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0;
	sa1100_ports[idx].port.mapbase = _Ser1UTCR0;		sa1100_ports[idx].port.mapbase = _Ser1UTCR0;
	sa1100_ports[idx].port.irq = IRQ_Ser1UART;		sa1100_ports[idx].port.irq = IRQ_Ser1UART;
	sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF;		sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
	break;		break;

	case 2:		case 2:
	sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0;		sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0;
	sa1100_ports[idx].port.mapbase = _Ser2UTCR0;		sa1100_ports[idx].port.mapbase = _Ser2UTCR0;
	sa1100_ports[idx].port.irq = IRQ_Ser2ICP;		sa1100_ports[idx].port.irq = IRQ_Ser2ICP;
	sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF;		sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
	break;		break;

	case 3:		case 3:
	sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0;		sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0;
	sa1100_ports[idx].port.mapbase = _Ser3UTCR0;		sa1100_ports[idx].port.mapbase = _Ser3UTCR0;
	sa1100_ports[idx].port.irq = IRQ_Ser3UART;		sa1100_ports[idx].port.irq = IRQ_Ser3UART;
	sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF;		sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
	break;		break;

	default:		default: