Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

serial: msm: Convert container_of UART_TO_MSM to static inline

Create static inline instead of define as it provides type safety and
is safer wrt. macros expansion.

Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220624205424.12686-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ilpo Järvinen and committed by
Greg Kroah-Hartman
24b5596a df5dac86

+26 -23
+26 -23
drivers/tty/serial/msm_serial.c
··· 181 181 struct msm_dma rx_dma; 182 182 }; 183 183 184 - #define UART_TO_MSM(uart_port) container_of(uart_port, struct msm_port, uart) 184 + static inline struct msm_port *to_msm_port(struct uart_port *up) 185 + { 186 + return container_of(up, struct msm_port, uart); 187 + } 185 188 186 189 static 187 190 void msm_write(struct uart_port *port, unsigned int val, unsigned int off) ··· 224 221 225 222 static void msm_serial_set_mnd_regs(struct uart_port *port) 226 223 { 227 - struct msm_port *msm_port = UART_TO_MSM(port); 224 + struct msm_port *msm_port = to_msm_port(port); 228 225 229 226 /* 230 227 * These registers don't exist so we change the clk input rate ··· 407 404 408 405 static void msm_stop_tx(struct uart_port *port) 409 406 { 410 - struct msm_port *msm_port = UART_TO_MSM(port); 407 + struct msm_port *msm_port = to_msm_port(port); 411 408 412 409 msm_port->imr &= ~UART_IMR_TXLEV; 413 410 msm_write(port, msm_port->imr, UART_IMR); ··· 415 412 416 413 static void msm_start_tx(struct uart_port *port) 417 414 { 418 - struct msm_port *msm_port = UART_TO_MSM(port); 415 + struct msm_port *msm_port = to_msm_port(port); 419 416 struct msm_dma *dma = &msm_port->tx_dma; 420 417 421 418 /* Already started in DMA mode */ ··· 693 690 694 691 static void msm_stop_rx(struct uart_port *port) 695 692 { 696 - struct msm_port *msm_port = UART_TO_MSM(port); 693 + struct msm_port *msm_port = to_msm_port(port); 697 694 struct msm_dma *dma = &msm_port->rx_dma; 698 695 699 696 msm_port->imr &= ~(UART_IMR_RXLEV | UART_IMR_RXSTALE); ··· 705 702 706 703 static void msm_enable_ms(struct uart_port *port) 707 704 { 708 - struct msm_port *msm_port = UART_TO_MSM(port); 705 + struct msm_port *msm_port = to_msm_port(port); 709 706 710 707 msm_port->imr |= UART_IMR_DELTA_CTS; 711 708 msm_write(port, msm_port->imr, UART_IMR); ··· 717 714 struct tty_port *tport = &port->state->port; 718 715 unsigned int sr; 719 716 int count = 0; 720 - struct msm_port *msm_port = UART_TO_MSM(port); 717 + struct msm_port *msm_port = to_msm_port(port); 721 718 722 719 if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) { 723 720 port->icount.overrun++; ··· 840 837 static void msm_handle_tx_pio(struct uart_port *port, unsigned int tx_count) 841 838 { 842 839 struct circ_buf *xmit = &port->state->xmit; 843 - struct msm_port *msm_port = UART_TO_MSM(port); 840 + struct msm_port *msm_port = to_msm_port(port); 844 841 unsigned int num_chars; 845 842 unsigned int tf_pointer = 0; 846 843 void __iomem *tf; ··· 886 883 887 884 static void msm_handle_tx(struct uart_port *port) 888 885 { 889 - struct msm_port *msm_port = UART_TO_MSM(port); 886 + struct msm_port *msm_port = to_msm_port(port); 890 887 struct circ_buf *xmit = &msm_port->uart.state->xmit; 891 888 struct msm_dma *dma = &msm_port->tx_dma; 892 889 unsigned int pio_count, dma_count, dma_min; ··· 950 947 static irqreturn_t msm_uart_irq(int irq, void *dev_id) 951 948 { 952 949 struct uart_port *port = dev_id; 953 - struct msm_port *msm_port = UART_TO_MSM(port); 950 + struct msm_port *msm_port = to_msm_port(port); 954 951 struct msm_dma *dma = &msm_port->rx_dma; 955 952 unsigned long flags; 956 953 unsigned int misr; ··· 1005 1002 1006 1003 static void msm_reset(struct uart_port *port) 1007 1004 { 1008 - struct msm_port *msm_port = UART_TO_MSM(port); 1005 + struct msm_port *msm_port = to_msm_port(port); 1009 1006 unsigned int mr; 1010 1007 1011 1008 /* reset everything */ ··· 1058 1055 msm_find_best_baud(struct uart_port *port, unsigned int baud, 1059 1056 unsigned long *rate) 1060 1057 { 1061 - struct msm_port *msm_port = UART_TO_MSM(port); 1058 + struct msm_port *msm_port = to_msm_port(port); 1062 1059 unsigned int divisor, result; 1063 1060 unsigned long target, old, best_rate = 0, diff, best_diff = ULONG_MAX; 1064 1061 const struct msm_baud_map *entry, *end, *best; ··· 1127 1124 unsigned long *saved_flags) 1128 1125 { 1129 1126 unsigned int rxstale, watermark, mask; 1130 - struct msm_port *msm_port = UART_TO_MSM(port); 1127 + struct msm_port *msm_port = to_msm_port(port); 1131 1128 const struct msm_baud_map *entry; 1132 1129 unsigned long flags, rate; 1133 1130 ··· 1188 1185 1189 1186 static void msm_init_clock(struct uart_port *port) 1190 1187 { 1191 - struct msm_port *msm_port = UART_TO_MSM(port); 1188 + struct msm_port *msm_port = to_msm_port(port); 1192 1189 1193 1190 clk_prepare_enable(msm_port->clk); 1194 1191 clk_prepare_enable(msm_port->pclk); ··· 1197 1194 1198 1195 static int msm_startup(struct uart_port *port) 1199 1196 { 1200 - struct msm_port *msm_port = UART_TO_MSM(port); 1197 + struct msm_port *msm_port = to_msm_port(port); 1201 1198 unsigned int data, rfr_level, mask; 1202 1199 int ret; 1203 1200 ··· 1249 1246 1250 1247 static void msm_shutdown(struct uart_port *port) 1251 1248 { 1252 - struct msm_port *msm_port = UART_TO_MSM(port); 1249 + struct msm_port *msm_port = to_msm_port(port); 1253 1250 1254 1251 msm_port->imr = 0; 1255 1252 msm_write(port, 0, UART_IMR); /* disable interrupts */ ··· 1265 1262 static void msm_set_termios(struct uart_port *port, struct ktermios *termios, 1266 1263 struct ktermios *old) 1267 1264 { 1268 - struct msm_port *msm_port = UART_TO_MSM(port); 1265 + struct msm_port *msm_port = to_msm_port(port); 1269 1266 struct msm_dma *dma = &msm_port->rx_dma; 1270 1267 unsigned long flags; 1271 1268 unsigned int baud, mr; ··· 1419 1416 static void msm_power(struct uart_port *port, unsigned int state, 1420 1417 unsigned int oldstate) 1421 1418 { 1422 - struct msm_port *msm_port = UART_TO_MSM(port); 1419 + struct msm_port *msm_port = to_msm_port(port); 1423 1420 1424 1421 switch (state) { 1425 1422 case 0: ··· 1438 1435 #ifdef CONFIG_CONSOLE_POLL 1439 1436 static int msm_poll_get_char_single(struct uart_port *port) 1440 1437 { 1441 - struct msm_port *msm_port = UART_TO_MSM(port); 1438 + struct msm_port *msm_port = to_msm_port(port); 1442 1439 unsigned int rf_reg = msm_port->is_uartdm ? UARTDM_RF : UART_RF; 1443 1440 1444 1441 if (!(msm_read(port, UART_SR) & UART_SR_RX_READY)) ··· 1492 1489 { 1493 1490 u32 imr; 1494 1491 int c; 1495 - struct msm_port *msm_port = UART_TO_MSM(port); 1492 + struct msm_port *msm_port = to_msm_port(port); 1496 1493 1497 1494 /* Disable all interrupts */ 1498 1495 imr = msm_read(port, UART_IMR); ··· 1512 1509 static void msm_poll_put_char(struct uart_port *port, unsigned char c) 1513 1510 { 1514 1511 u32 imr; 1515 - struct msm_port *msm_port = UART_TO_MSM(port); 1512 + struct msm_port *msm_port = to_msm_port(port); 1516 1513 1517 1514 /* Disable all interrupts */ 1518 1515 imr = msm_read(port, UART_IMR); ··· 1680 1677 BUG_ON(co->index < 0 || co->index >= UART_NR); 1681 1678 1682 1679 port = msm_get_port_from_line(co->index); 1683 - msm_port = UART_TO_MSM(port); 1680 + msm_port = to_msm_port(port); 1684 1681 1685 1682 __msm_console_write(port, s, count, msm_port->is_uartdm); 1686 1683 } ··· 1811 1808 1812 1809 port = msm_get_port_from_line(line); 1813 1810 port->dev = &pdev->dev; 1814 - msm_port = UART_TO_MSM(port); 1811 + msm_port = to_msm_port(port); 1815 1812 1816 1813 id = of_match_device(msm_uartdm_table, &pdev->dev); 1817 1814 if (id)