Skip to contentSkip to conversation

clk: ls1028a: Fix warning on clamp() usage

PATCH Applied Stephen Boyd 2 participants 5 messages Feb 3, 2020

Subsystems (2)
lore
Share & tools
lore

Stephen Boyd

author maintainer
#0 lore raw

PATCH 1/2 clk: ls1028a: Fix warning on clamp() usage

These constants are used in clamp() with the value being clamped an unsigned long. Make them unsigned long defines so that clamp() doesn't complain about comparing different types.

In file included from include/linux/list.h:9,

                 from include/linux/kobject.h:19,
                 from include/linux/of.h:17,
                 from include/linux/clk-provider.h:9,
                 from drivers/clk/clk-plldig.c:8:
drivers/clk/clk-plldig.c: In function 'plldig_determine_rate':
include/linux/kernel.h:835:29: warning: comparison of distinct pointer types lacks a cast
  835 |   (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
      |
Cc Wen He <[email protected]>
Fixes d37010a3c162 ("clk: ls1028a: Add clock driver for Display output interface")
---
 drivers/clk/clk-plldig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-plldig.c +2 -2
index a5da08f98d01..312b8312d503 100644
@@ -37,8 +37,8 @@
 #define PLLDIG_MAX_VCO_FREQ         1300000000
 
 /* Range of the output frequencies, in Hz */
-#define PHI1_MIN_FREQ               27000000
-#define PHI1_MAX_FREQ               600000000
+#define PHI1_MIN_FREQ               27000000UL
+#define PHI1_MAX_FREQ               600000000UL
 
 /* Maximum value of the reduced frequency divider */
 #define MAX_RFDPHI1          63UL
Signature · 1 line
Sent by a computer, using git, on the internet
author maintainer
#1 lore raw

PATCH 2/2 dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id

Having 'bindings' in here causes a warning when checking the schema.

Documentation/devicetree/bindings/clock/fsl,plldig.yaml:
$id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/fsl,plldig.yaml#

Remove it.

---
 Documentation/devicetree/bindings/clock/fsl,plldig.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/fsl,plldig.yaml +1 -1
index ad37d3273229..c8350030b374 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/bindings/clock/fsl,plldig.yaml#
+$id: http://devicetree.org/schemas/clock/fsl,plldig.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: NXP QorIQ Layerscape LS1028A Display PIXEL Clock Binding
Signature · 1 line
Sent by a computer, using git, on the internet
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id

Quoted 7 lines · Stephen Boyd

Having 'bindings' in here causes a warning when checking the schema.

Documentation/devicetree/bindings/clock/fsl,plldig.yaml:
$id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/fsl,plldig.yaml#

Quoted 8 lines

Remove it.

---
 Documentation/devicetree/bindings/clock/fsl,plldig.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

There's actually a more few of these in clock bindings. I am going to do a tree wide fix on this. I was waiting until the clock tree is merged.

And I didn't really mean to commit this check to dtschema until all these were fixed, so I've reverted it for now.

So either go ahead and apply this or I'll get it.

Rob

author maintainer Applied
#3 lore raw

Re: [PATCH 2/2] dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id

In reply to Stephen Boyd

Quoting Stephen Boyd (2020-02-02 21:25:07)

Quoted 6 lines

Having 'bindings' in here causes a warning when checking the schema.

Documentation/devicetree/bindings/clock/fsl,plldig.yaml:
$id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/clock/fsl,plldig.yaml#

Quoted 6 lines

Remove it.

---

Applied to clk-next

author maintainer Applied
#4 lore raw
In reply to Stephen Boyd

Quoting Stephen Boyd (2020-02-02 21:25:06)

Quoted 14 lines

These constants are used in clamp() with the value being clamped an unsigned long. Make them unsigned long defines so that clamp() doesn't complain about comparing different types.

In file included from include/linux/list.h:9,

                 from include/linux/kobject.h:19,
                 from include/linux/of.h:17,
                 from include/linux/clk-provider.h:9,
                 from drivers/clk/clk-plldig.c:8:
drivers/clk/clk-plldig.c: In function 'plldig_determine_rate':
include/linux/kernel.h:835:29: warning: comparison of distinct pointer types lacks a cast
  835 |   (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
      |
Quoted 5 lines
Cc Wen He <[email protected]>
Fixes d37010a3c162 ("clk: ls1028a: Add clock driver for Display output interface")

---

Applied to clk-next