2024-01-26 03:03:13

by Rob Herring

Subject: [PATCH] nvmem: fixed-cell: Simplify nested if/then schema

There's no reason to have a nested if/then schema as checking for compatible
being present and containing 'mac-base' can all be done in one 'if' schema.

Signed-off-by: Rob Herring <[email protected]>
---
.../bindings/nvmem/layouts/fixed-cell.yaml | 22 +++++++++----------
1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
index ac2381e66027..8b3826243ddd 100644
--- a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
+++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
@@ -36,20 +36,18 @@ properties:

allOf:
- if:
+ properties:
+ compatible:
+ contains:
+ const: mac-base
required: [ compatible ]
then:
- if:
- properties:
- compatible:
- contains:
- const: mac-base
- then:
- properties:
- "#nvmem-cell-cells":
- description: The first argument is a MAC address offset.
- const: 1
- required:
- - "#nvmem-cell-cells"
+ properties:
+ "#nvmem-cell-cells":
+ description: The first argument is a MAC address offset.
+ const: 1
+ required:
+ - "#nvmem-cell-cells"

required:
- reg
--
2.43.0

2024-01-27 11:27:46

by Srinivas Kandagatla

Subject: Re: [PATCH] nvmem: fixed-cell: Simplify nested if/then schema

On Thu, 25 Jan 2024 07:46:44 -0600, Rob Herring wrote:
> There's no reason to have a nested if/then schema as checking for compatible
> being present and containing 'mac-base' can all be done in one 'if' schema.
>
>

Applied, thanks!

[1/1] nvmem: fixed-cell: Simplify nested if/then schema
commit: 290ea1d6f990c92d5ae599554d8acafdd0ddeb2e

Best regards,
--
Srinivas Kandagatla <[email protected]>