8250_dwlib: Convert bitops to newer form

Instead of open-coding, use BIT(), GENMASK(), and FIELD_GET() helpers.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220630100536.41329-1-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c
index da330ef46446101d00236be7c1561b863cdb6e35..a8bbed74ea7006ea03c3b94c5ddb9b8c11c44554 100644 (file)
--- a/drivers/tty/serial/8250/8250_dwlib.c
+++ b/drivers/tty/serial/8250/8250_dwlib.c
@@ -46,21 +46,21 @@
 #define DW_UART_LCR_EXT_TRANSMIT_MODE  BIT(3)
 
 /* Component Parameter Register bits */
-#define DW_UART_CPR_ABP_DATA_WIDTH     (3 << 0)
-#define DW_UART_CPR_AFCE_MODE          (1 << 4)
-#define DW_UART_CPR_THRE_MODE          (1 << 5)
-#define DW_UART_CPR_SIR_MODE           (1 << 6)
-#define DW_UART_CPR_SIR_LP_MODE                (1 << 7)
-#define DW_UART_CPR_ADDITIONAL_FEATURES        (1 << 8)
-#define DW_UART_CPR_FIFO_ACCESS                (1 << 9)
-#define DW_UART_CPR_FIFO_STAT          (1 << 10)
-#define DW_UART_CPR_SHADOW             (1 << 11)
-#define DW_UART_CPR_ENCODED_PARMS      (1 << 12)
-#define DW_UART_CPR_DMA_EXTRA          (1 << 13)
-#define DW_UART_CPR_FIFO_MODE          (0xff << 16)
+#define DW_UART_CPR_ABP_DATA_WIDTH     GENMASK(1, 0)
+#define DW_UART_CPR_AFCE_MODE          BIT(4)
+#define DW_UART_CPR_THRE_MODE          BIT(5)
+#define DW_UART_CPR_SIR_MODE           BIT(6)
+#define DW_UART_CPR_SIR_LP_MODE                BIT(7)
+#define DW_UART_CPR_ADDITIONAL_FEATURES        BIT(8)
+#define DW_UART_CPR_FIFO_ACCESS                BIT(9)
+#define DW_UART_CPR_FIFO_STAT          BIT(10)
+#define DW_UART_CPR_SHADOW             BIT(11)
+#define DW_UART_CPR_ENCODED_PARMS      BIT(12)
+#define DW_UART_CPR_DMA_EXTRA          BIT(13)
+#define DW_UART_CPR_FIFO_MODE          GENMASK(23, 16)
 
 /* Helper for FIFO size calculation */
-#define DW_UART_CPR_FIFO_SIZE(a)       (((a >> 16) & 0xff) * 16)
+#define DW_UART_CPR_FIFO_SIZE(a)       (FIELD_GET(DW_UART_CPR_FIFO_MODE, (a)) * 16)
 
 /*
  * divisor = div(I) + div(F)