serial: 8250: Switch UART port flags to using BIT_ULL

Use BIT_ULL rather than encoding bits explicitly where applicable with
UART port flags.  This makes a (__force upf_t) cast redundant, but keep
it for visual consistency with the flags defined in terms of userspace
macros.

Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Link: https://lore.kernel.org/r/alpine.DEB.2.21.2209210007030.41633@angie.orcam.me.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 2ae182f0f1de658b45201f0a61ce71bb44f5bc58..9e0a9d3793908072645ceb5b7e93cb9ceb2d283c 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -513,24 +513,24 @@ struct uart_port {
 #define UPF_BUGGY_UART         ((__force upf_t) ASYNC_BUGGY_UART     /* 14 */ )
 #define UPF_MAGIC_MULTIPLIER   ((__force upf_t) ASYNC_MAGIC_MULTIPLIER /* 16 */ )
 
-#define UPF_NO_THRE_TEST       ((__force upf_t) (1 << 19))
+#define UPF_NO_THRE_TEST       ((__force upf_t) BIT_ULL(19))
 /* Port has hardware-assisted h/w flow control */
-#define UPF_AUTO_CTS           ((__force upf_t) (1 << 20))
-#define UPF_AUTO_RTS           ((__force upf_t) (1 << 21))
+#define UPF_AUTO_CTS           ((__force upf_t) BIT_ULL(20))
+#define UPF_AUTO_RTS           ((__force upf_t) BIT_ULL(21))
 #define UPF_HARD_FLOW          ((__force upf_t) (UPF_AUTO_CTS | UPF_AUTO_RTS))
 /* Port has hardware-assisted s/w flow control */
-#define UPF_SOFT_FLOW          ((__force upf_t) (1 << 22))
-#define UPF_CONS_FLOW          ((__force upf_t) (1 << 23))
-#define UPF_SHARE_IRQ          ((__force upf_t) (1 << 24))
-#define UPF_EXAR_EFR           ((__force upf_t) (1 << 25))
-#define UPF_BUG_THRE           ((__force upf_t) (1 << 26))
+#define UPF_SOFT_FLOW          ((__force upf_t) BIT_ULL(22))
+#define UPF_CONS_FLOW          ((__force upf_t) BIT_ULL(23))
+#define UPF_SHARE_IRQ          ((__force upf_t) BIT_ULL(24))
+#define UPF_EXAR_EFR           ((__force upf_t) BIT_ULL(25))
+#define UPF_BUG_THRE           ((__force upf_t) BIT_ULL(26))
 /* The exact UART type is known and should not be probed.  */
-#define UPF_FIXED_TYPE         ((__force upf_t) (1 << 27))
-#define UPF_BOOT_AUTOCONF      ((__force upf_t) (1 << 28))
-#define UPF_FIXED_PORT         ((__force upf_t) (1 << 29))
-#define UPF_DEAD               ((__force upf_t) (1 << 30))
-#define UPF_IOREMAP            ((__force upf_t) (1 << 31))
-#define UPF_FULL_PROBE         ((__force upf_t) (1ULL << 32))
+#define UPF_FIXED_TYPE         ((__force upf_t) BIT_ULL(27))
+#define UPF_BOOT_AUTOCONF      ((__force upf_t) BIT_ULL(28))
+#define UPF_FIXED_PORT         ((__force upf_t) BIT_ULL(29))
+#define UPF_DEAD               ((__force upf_t) BIT_ULL(30))
+#define UPF_IOREMAP            ((__force upf_t) BIT_ULL(31))
+#define UPF_FULL_PROBE         ((__force upf_t) BIT_ULL(32))
 
 #define __UPF_CHANGE_MASK      0x17fff
 #define UPF_CHANGE_MASK                ((__force upf_t) __UPF_CHANGE_MASK)