time64.h: Consolidated PSEC_PER_SEC definition

We have currently three users of the PSEC_PER_SEC each of them defining it
individually. Instead, move it to time64.h to be available for everyone.

There is a new user coming with the same constant in use. It will also
make its life easier.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot_ptp.c b/drivers/net/ethernet/mscc/ocelot_ptp.c
index a33ab315cc6bd78c5cb6561dd567ef4b3d73b57f..87ad2137ba0653aad178e10a849dc37d0c7a0629 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_ptp.c
+++ b/drivers/net/ethernet/mscc/ocelot_ptp.c
@@ -4,6 +4,8 @@
  * Copyright (c) 2017 Microsemi Corporation
  * Copyright 2020 NXP
  */
+#include <linux/time64.h>
+
 #include <soc/mscc/ocelot_ptp.h>
 #include <soc/mscc/ocelot_sys.h>
 #include <soc/mscc/ocelot.h>

diff --git a/drivers/phy/phy-core-mipi-dphy.c b/drivers/phy/phy-core-mipi-dphy.c
index 14e0551cd3190f71aeb85f0318c3d71c455836de..77fe65367ce53a710201e5bc2604e6308e2a9ea4 100644 (file)
--- a/drivers/phy/phy-core-mipi-dphy.c
+++ b/drivers/phy/phy-core-mipi-dphy.c
@@ -12,8 +12,6 @@
 #include <linux/phy/phy.h>
 #include <linux/phy/phy-mipi-dphy.h>
 
-#define PSEC_PER_SEC   1000000000000LL
-
 /*
  * Minimum D-PHY timings based on MIPI D-PHY specification. Derived
  * from the valid ranges specified in Section 6.9, Table 14, Page 41

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
index 8af8c6c5cc028b2799015e636ecdaed6a5db0289..347dc79a18c18a6f235bc47c89b4b861cdd0c60a 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
@@ -11,16 +11,16 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/reset.h>
+#include <linux/time64.h>
+
 #include <linux/phy/phy.h>
 #include <linux/phy/phy-mipi-dphy.h>
-#include <linux/pm_runtime.h>
-#include <linux/mfd/syscon.h>
-
-#define PSEC_PER_SEC   1000000000000LL
 
 #define UPDATE(x, h, l)        (((x) << (l)) & GENMASK((h), (l)))
 

diff --git a/include/soc/mscc/ocelot_ptp.h b/include/soc/mscc/ocelot_ptp.h
index 6a7388fa7cc5283bfcf4d2590a31175b10c38789..ded497d72bdbbcad572be9636416b04bf24c8546 100644 (file)
--- a/include/soc/mscc/ocelot_ptp.h
+++ b/include/soc/mscc/ocelot_ptp.h
@@ -37,8 +37,6 @@ enum {
 
 #define PTP_CFG_MISC_PTP_EN            BIT(2)
 
-#define PSEC_PER_SEC                   1000000000000LL
-
 #define PTP_CFG_CLK_ADJ_CFG_ENA                BIT(0)
 #define PTP_CFG_CLK_ADJ_CFG_DIR                BIT(1)
 

diff --git a/include/vdso/time64.h b/include/vdso/time64.h
index 9d43c3f5e89d459ef0e5148b3dff004096a959ac..b40cfa2aa33c8dea1aa431cdf7af97ab45b7f9fb 100644 (file)
--- a/include/vdso/time64.h
+++ b/include/vdso/time64.h
@@ -9,6 +9,7 @@
 #define NSEC_PER_MSEC  1000000L
 #define USEC_PER_SEC   1000000L
 #define NSEC_PER_SEC   1000000000L
+#define PSEC_PER_SEC   1000000000000LL
 #define FSEC_PER_SEC   1000000000000000LL
 
 #endif /* __VDSO_TIME64_H */