ptp_ocp: use bits.h macros for all masks

Currently we are using BIT(), but GENMASK(). Make use of the latter one
as well (far less error-prone, far more concise).

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Vadim Fedorenko <vfedorenko@novek.ru>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 4519ef42b4587beb44475bdfe9f1e4f37a307328..c8dea4c89bc27b623a558e1a78ba00f8207362ad 100644 (file)
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2020 Facebook */
 
+#include <linux/bits.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -88,10 +89,10 @@ struct tod_reg {
 #define TOD_CTRL_DISABLE_FMT_A BIT(17)
 #define TOD_CTRL_DISABLE_FMT_B BIT(16)
 #define TOD_CTRL_ENABLE                BIT(0)
-#define TOD_CTRL_GNSS_MASK     ((1U << 4) - 1)
+#define TOD_CTRL_GNSS_MASK     GENMASK(3, 0)
 #define TOD_CTRL_GNSS_SHIFT    24
 
-#define TOD_STATUS_UTC_MASK            0xff
+#define TOD_STATUS_UTC_MASK            GENMASK(7, 0)
 #define TOD_STATUS_UTC_VALID           BIT(8)
 #define TOD_STATUS_LEAP_ANNOUNCE       BIT(12)
 #define TOD_STATUS_LEAP_VALID          BIT(16)
@@ -205,7 +206,7 @@ struct frequency_reg {
 #define FREQ_STATUS_VALID      BIT(31)
 #define FREQ_STATUS_ERROR      BIT(30)
 #define FREQ_STATUS_OVERRUN    BIT(29)
-#define FREQ_STATUS_MASK       (BIT(24) - 1)
+#define FREQ_STATUS_MASK       GENMASK(23, 0)
 
 struct ptp_ocp_flash_info {
        const char *name;
@@ -674,9 +675,9 @@ static const struct ocp_selector ptp_ocp_clock[] = {
        { }
 };
 
+#define SMA_DISABLE            BIT(16)
 #define SMA_ENABLE             BIT(15)
-#define SMA_SELECT_MASK                ((1U << 15) - 1)
-#define SMA_DISABLE            0x10000
+#define SMA_SELECT_MASK                GENMASK(14, 0)
 
 static const struct ocp_selector ptp_ocp_sma_in[] = {
        { .name = "10Mhz",      .value = 0x0000 },
@@ -3440,7 +3441,7 @@ ptp_ocp_tod_status_show(struct seq_file *s, void *data)
 
        val = ioread32(&bp->tod->utc_status);
        seq_printf(s, "UTC status register: 0x%08X\n", val);
-       seq_printf(s, "UTC offset: %d  valid:%d\n",
+       seq_printf(s, "UTC offset: %ld  valid:%d\n",
                val & TOD_STATUS_UTC_MASK, val & TOD_STATUS_UTC_VALID ? 1 : 0);
        seq_printf(s, "Leap second info valid:%d, Leap second announce %d\n",
                val & TOD_STATUS_LEAP_VALID ? 1 : 0,