diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:04:20 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:04:45 +0300 |
| commit | ff348ceeaf6b41d45a868fd4c9078d87052c4143 (patch) | |
| tree | d90d9cfd80aa604c7c4f0b1a56f9cd00cb952a3d | |
| parent | ff52a65e4e4c86bd3533f070a49247a3adc63e0d (diff) | |
Revert "clk: msm: Don't implicitly convert double to boolean in FIXDIV macros"
* We'll take the upstream fix
This reverts commit 82d659482586d39a96528d28f7560505189604f0.
Change-Id: I956e6f73bdaeb8dee9ee1b6c62b0f95f955fca54
| -rw-r--r-- | drivers/clk/msm/clock-gcc-8996.c | 2 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-gcc-8998.c | 2 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-mmss-8996.c | 2 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-mmss-8998.c | 2 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-osm.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/clk/msm/clock-gcc-8996.c b/drivers/clk/msm/clock-gcc-8996.c index 9c234c1ed031..6dd2cf879c49 100644 --- a/drivers/clk/msm/clock-gcc-8996.c +++ b/drivers/clk/msm/clock-gcc-8996.c @@ -42,7 +42,7 @@ static void __iomem *virt_dbgbase; #define gpll0_out_main_source_val 1 #define gpll4_out_main_source_val 5 -#define FIXDIV(div) (div != 0 ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-gcc-8998.c b/drivers/clk/msm/clock-gcc-8998.c index 0d43d29abcf3..b1c8cc43769f 100644 --- a/drivers/clk/msm/clock-gcc-8998.c +++ b/drivers/clk/msm/clock-gcc-8998.c @@ -44,7 +44,7 @@ static void __iomem *virt_dbgbase; #define gpll4_out_main_source_val 5 #define gpll0_early_div_source_val 6 -#define FIXDIV(div) (div != 0 ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-mmss-8996.c b/drivers/clk/msm/clock-mmss-8996.c index 06602f4c36e9..339ae1622005 100644 --- a/drivers/clk/msm/clock-mmss-8996.c +++ b/drivers/clk/msm/clock-mmss-8996.c @@ -53,7 +53,7 @@ static void __iomem *virt_base_gpu; #define dsi1phypll_mm_source_val 2 #define ext_extpclk_clk_src_mm_source_val 1 -#define FIXDIV(div) (div != 0 ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) #define F_MM(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-mmss-8998.c b/drivers/clk/msm/clock-mmss-8998.c index 5d6cf9b009ee..fdaaa723accd 100644 --- a/drivers/clk/msm/clock-mmss-8998.c +++ b/drivers/clk/msm/clock-mmss-8998.c @@ -51,7 +51,7 @@ static void __iomem *virt_base; #define ext_dp_phy_pll_link_mm_source_val 1 #define ext_dp_phy_pll_vco_mm_source_val 2 -#define FIXDIV(div) (div != 0 ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) #define F_MM(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-osm.c b/drivers/clk/msm/clock-osm.c index 88f4abf78fd1..a1635bad3bb0 100644 --- a/drivers/clk/msm/clock-osm.c +++ b/drivers/clk/msm/clock-osm.c @@ -272,7 +272,7 @@ static void __iomem *debug_base; #define ACD_REG_RELATIVE_ADDR_BITMASK(addr) \ (1 << (ACD_REG_RELATIVE_ADDR(addr))) -#define FIXDIV(div) (div != 0 ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ |