Skip to contentSkip to conversation

dt-bindings: Add missing start and/or end of line regex anchors

PATCH In review Rob Herring 8 participants 8 messages Nov 18, 2022 – Nov 21, 2022

Subsystems (21)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: Add missing start and/or end of line regex anchors

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

---
 .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml       | 2 +-
 Documentation/devicetree/bindings/hwmon/adt7475.yaml          | 4 ++--
 .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml    | 4 ++--
 .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml         | 2 +-
 .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml        | 2 +-
 Documentation/devicetree/bindings/regulator/max8660.yaml      | 2 +-
 .../devicetree/bindings/regulator/maxim,max77802.yaml         | 2 +-
 Documentation/devicetree/bindings/regulator/regulator.yaml    | 2 +-
 .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml  | 2 +-
 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml     | 2 +-
 .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +1 -1
index a11e1b867379..3c00ad09eeaa 100644
@@ -38,7 +38,7 @@ properties:
     type: object
 
     patternProperties:
-      'cpu@[0-9a-f]+':
+      '^cpu@[0-9a-f]+$':
         type: object
 
         properties:
Documentation/devicetree/bindings/hwmon/adt7475.yaml +2 -2
index ea595102a86e..051c976ab711 100644
@@ -61,7 +61,7 @@ patternProperties:
     $ref: /schemas/types.yaml#/definitions/uint32
     enum: [0, 1]
 
-  "adi,pin(5|10)-function":
+  "^adi,pin(5|10)-function$":
     description: |
       Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or
       pin 10 on the adi,adt7476 and adi,adt7490.
@@ -70,7 +70,7 @@ patternProperties:
       - pwm2
       - smbalert#
 
-  "adi,pin(9|14)-function":
+  "^adi,pin(9|14)-function$":
     description: |
       Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or
       pin 14 on the adi,adt7476 and adi,adt7490
Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +2 -2
index 385b0692261c..51f62c3ae194 100644
@@ -41,7 +41,7 @@ required:
   - nvmem-cells
 
 patternProperties:
-  "opp-[0-9]+":
+  "^opp-[0-9]+$":
     type: object
 
     properties:
@@ -49,7 +49,7 @@ patternProperties:
       clock-latency-ns: true
 
     patternProperties:
-      "opp-microvolt-.*": true
+      "^opp-microvolt-speed[0-9]$": true
 
     required:
       - opp-hz
Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml +1 -1
index d60f43fd9c5a..e63e6458cea8 100644
@@ -31,7 +31,7 @@ properties:
     maxItems: 2
 
 patternProperties:
-  'pcie@[0-2],0':
+  '^pcie@[0-2],0$':
     type: object
     $ref: /schemas/pci/pci-bus.yaml#
 
Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml +1 -1
index 0f18cceba3d5..5a0d64d3ae6b 100644
@@ -65,7 +65,7 @@ properties:
     maxItems: 1
 
 patternProperties:
-  'usb@[0-1],0':
+  '^usb@[0-1],0$':
     type: object
 
     description:
Documentation/devicetree/bindings/regulator/max8660.yaml +1 -1
index 9c038698f880..4d550ca396eb 100644
@@ -24,7 +24,7 @@ properties:
     type: object
 
     patternProperties:
-      "regulator-.+":
+      "^regulator-.+$":
         $ref: "regulator.yaml#"
 
     additionalProperties: false
Documentation/devicetree/bindings/regulator/maxim,max77802.yaml +1 -1
index 71138c611b6c..b704f05ea454 100644
@@ -77,7 +77,7 @@ patternProperties:
       regulator-initial-mode: false
 
     patternProperties:
-      regulator-state-(standby|mem|disk):
+      "^regulator-state-(standby|mem|disk)$":
         type: object
         additionalProperties: true
         properties:
Documentation/devicetree/bindings/regulator/regulator.yaml +1 -1
index 6e8aa9eed3aa..53b81d8a2d41 100644
@@ -231,7 +231,7 @@ patternProperties:
   ".*-supply$":
     description: Input supply phandle(s) for this node
 
-  regulator-state-(standby|mem|disk):
+  "^regulator-state-(standby|mem|disk)$":
     type: object
     description:
       sub-nodes for regulator state in Standby, Suspend-to-RAM, and
Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml +1 -1
index 7cb74cc8c5d9..54be194bb244 100644
@@ -21,7 +21,7 @@ description: |
   regulator-voutl1, regulator-vouts1
 
 patternProperties:
-  "regulator-.+":
+  "^regulator-.+$":
     type: object
     description:
       Properties for single regulator.
Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +1 -1
index 679a246dd666..7df40c38e865 100644
@@ -115,7 +115,7 @@ properties:
   ports:
     $ref: /schemas/graph.yaml#/properties/ports
     patternProperties:
-      port(@[0-9a-f]+)?:
+      '^port(@[0-9a-f]+)?$':
         $ref: audio-graph-port.yaml#
         unevaluatedProperties: false
 
Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml +1 -1
index 6b733e5c1163..899100e783c9 100644
@@ -48,7 +48,7 @@ properties:
       - const: tx
 
 patternProperties:
-  "@[0-9a-f]+":
+  "@[0-9a-f]+$":
     type: object
 
     properties:
Signature · 1 line
2.35.1
maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Rob Herring
Quoted 10 lines · Rob Herring

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

---
 .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml       | 2 +-
 Documentation/devicetree/bindings/hwmon/adt7475.yaml          | 4 ++--

For hwmon:

Quoted 172 lines
 .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml    | 4 ++--
 .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml         | 2 +-
 .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml        | 2 +-
 Documentation/devicetree/bindings/regulator/max8660.yaml      | 2 +-
 .../devicetree/bindings/regulator/maxim,max77802.yaml         | 2 +-
 Documentation/devicetree/bindings/regulator/regulator.yaml    | 2 +-
 .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml  | 2 +-
 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml     | 2 +-
 .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +1 -1
index a11e1b867379..3c00ad09eeaa 100644
@@ -38,7 +38,7 @@ properties:
     type: object
 
     patternProperties:
-      'cpu@[0-9a-f]+':
+      '^cpu@[0-9a-f]+$':
         type: object
 
         properties:
Documentation/devicetree/bindings/hwmon/adt7475.yaml +2 -2
index ea595102a86e..051c976ab711 100644
@@ -61,7 +61,7 @@ patternProperties:
     $ref: /schemas/types.yaml#/definitions/uint32
     enum: [0, 1]
 
-  "adi,pin(5|10)-function":
+  "^adi,pin(5|10)-function$":
     description: |
       Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or
       pin 10 on the adi,adt7476 and adi,adt7490.
@@ -70,7 +70,7 @@ patternProperties:
       - pwm2
       - smbalert#
 
-  "adi,pin(9|14)-function":
+  "^adi,pin(9|14)-function$":
     description: |
       Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or
       pin 14 on the adi,adt7476 and adi,adt7490
Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +2 -2
index 385b0692261c..51f62c3ae194 100644
@@ -41,7 +41,7 @@ required:
   - nvmem-cells
 
 patternProperties:
-  "opp-[0-9]+":
+  "^opp-[0-9]+$":
     type: object
 
     properties:
@@ -49,7 +49,7 @@ patternProperties:
       clock-latency-ns: true
 
     patternProperties:
-      "opp-microvolt-.*": true
+      "^opp-microvolt-speed[0-9]$": true
 
     required:
       - opp-hz
Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml +1 -1
index d60f43fd9c5a..e63e6458cea8 100644
@@ -31,7 +31,7 @@ properties:
     maxItems: 2
 
 patternProperties:
-  'pcie@[0-2],0':
+  '^pcie@[0-2],0$':
     type: object
     $ref: /schemas/pci/pci-bus.yaml#
 
Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml +1 -1
index 0f18cceba3d5..5a0d64d3ae6b 100644
@@ -65,7 +65,7 @@ properties:
     maxItems: 1
 
 patternProperties:
-  'usb@[0-1],0':
+  '^usb@[0-1],0$':
     type: object
 
     description:
Documentation/devicetree/bindings/regulator/max8660.yaml +1 -1
index 9c038698f880..4d550ca396eb 100644
@@ -24,7 +24,7 @@ properties:
     type: object
 
     patternProperties:
-      "regulator-.+":
+      "^regulator-.+$":
         $ref: "regulator.yaml#"
 
     additionalProperties: false
Documentation/devicetree/bindings/regulator/maxim,max77802.yaml +1 -1
index 71138c611b6c..b704f05ea454 100644
@@ -77,7 +77,7 @@ patternProperties:
       regulator-initial-mode: false
 
     patternProperties:
-      regulator-state-(standby|mem|disk):
+      "^regulator-state-(standby|mem|disk)$":
         type: object
         additionalProperties: true
         properties:
Documentation/devicetree/bindings/regulator/regulator.yaml +1 -1
index 6e8aa9eed3aa..53b81d8a2d41 100644
@@ -231,7 +231,7 @@ patternProperties:
   ".*-supply$":
     description: Input supply phandle(s) for this node
 
-  regulator-state-(standby|mem|disk):
+  "^regulator-state-(standby|mem|disk)$":
     type: object
     description:
       sub-nodes for regulator state in Standby, Suspend-to-RAM, and
Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml +1 -1
index 7cb74cc8c5d9..54be194bb244 100644
@@ -21,7 +21,7 @@ description: |
   regulator-voutl1, regulator-vouts1
 
 patternProperties:
-  "regulator-.+":
+  "^regulator-.+$":
     type: object
     description:
       Properties for single regulator.
Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +1 -1
index 679a246dd666..7df40c38e865 100644
@@ -115,7 +115,7 @@ properties:
   ports:
     $ref: /schemas/graph.yaml#/properties/ports
     patternProperties:
-      port(@[0-9a-f]+)?:
+      '^port(@[0-9a-f]+)?$':
         $ref: audio-graph-port.yaml#
         unevaluatedProperties: false
 
Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml +1 -1
index 6b733e5c1163..899100e783c9 100644
@@ -48,7 +48,7 @@ properties:
       - const: tx
 
 patternProperties:
-  "@[0-9a-f]+":
+  "@[0-9a-f]+$":
     type: object
 
     properties:
maintainer Acked-by on v1 1/1
#4 lore raw
In reply to Rob Herring

Hi Rob,

Quoted 6 lines

From: Rob Herring, Sent: Saturday, November 19, 2022 7:37 AM

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

Quoted 7 lines
---
 .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml       | 2 +-
 Documentation/devicetree/bindings/hwmon/adt7475.yaml          | 4 ++--
 .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml    | 4 ++--
 .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml         | 2 +-
 .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml        | 2 +-

Thank you for the patch! For R-Car PCI,

Best regards,
Yoshihiro Shimoda

maintainer Acked-by on v1 1/1
#5 lore raw
In reply to Rob Herring
Quoted 47 lines · Rob Herring

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

---
 .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml       | 2 +-
 Documentation/devicetree/bindings/hwmon/adt7475.yaml          | 4 ++--
 .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml    | 4 ++--
 .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml         | 2 +-
 .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml        | 2 +-
 Documentation/devicetree/bindings/regulator/max8660.yaml      | 2 +-
 .../devicetree/bindings/regulator/maxim,max77802.yaml         | 2 +-
 Documentation/devicetree/bindings/regulator/regulator.yaml    | 2 +-
 .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml  | 2 +-
 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml     | 2 +-
 .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +1 -1
index a11e1b867379..3c00ad09eeaa 100644
@@ -38,7 +38,7 @@ properties:
     type: object
 
     patternProperties:
-      'cpu@[0-9a-f]+':
+      '^cpu@[0-9a-f]+$':
         type: object
 
         properties:
Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +1 -1
index 385b0692261c..51f62c3ae194 100644
@@ -41,7 +41,7 @@ required:
   - nvmem-cells
 
 patternProperties:
-  "opp-[0-9]+":
+  "^opp-[0-9]+$":
     type: object
 
     properties:

Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml patternProperties: · line 55

Quoted 8 lines
Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +1 -1
@@ -49,7 +49,7 @@ patternProperties:
       clock-latency-ns: true
 
     patternProperties:
-      "opp-microvolt-.*": true
+      "^opp-microvolt-speed[0-9]$": true
 
     required:
       - opp-hz
Signature · 1 line
viresh
Reviewed-by on v1 1/1
#6 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

 .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml        | 2 +-
 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml     | 2 +-

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Acked-by on v1 1/1
#7 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten.

---

  .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml  | 2 +-
Signature · 5 lines
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland

~~ When things go utterly wrong vim users can always type :help! ~~