diff mbox series

[v4,3/5] firmware: scmi: fix inline comments and minor coding style issues

Message ID 20210308213810.29535-3-etienne.carriere@linaro.org
State Accepted
Commit c3bba708da5ec3066bfaaaede8783e891f984a1a
Headers show
Series [v4,1/5] firmware: scmi: voltage regulator | expand

Commit Message

Etienne Carriere March 8, 2021, 9:38 p.m. UTC 
Fix inline comments and empty line in scmi driver and test files.

Remove test on IS_ENABLED(CONFIG_*_SCMI) in test/dm/scmi.c since these
configuration are expected enabled when CONFIG_FIRMWARE_SCMI is enabled
in sandbox configuration.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

Reviewed-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

---
Changes in v4:
 - no change

Changes in v3:
 - applied review tags

Changes in v2:
 - discard adding tests on IS_ENABLED(CONFIG_*_SCMI) in test/dm/scmi.c
   for the reason stated in commit log.
---
 arch/sandbox/include/asm/scmi_test.h       |  5 +++--
 drivers/firmware/scmi/sandbox-scmi_agent.c |  4 ++--
 test/dm/scmi.c                             | 15 ++-------------
 3 files changed, 7 insertions(+), 17 deletions(-)

-- 
2.17.1

Comments

Tom Rini April 13, 2021, 2:28 p.m. UTC | #1 
On Mon, Mar 08, 2021 at 10:38:08PM +0100, Etienne Carriere wrote:

> Fix inline comments and empty line in scmi driver and test files.

> 

> Remove test on IS_ENABLED(CONFIG_*_SCMI) in test/dm/scmi.c since these

> configuration are expected enabled when CONFIG_FIRMWARE_SCMI is enabled

> in sandbox configuration.

> 

> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

> Reviewed-by: Simon Glass <sjg@chromium.org>

> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/arch/sandbox/include/asm/scmi_test.h b/arch/sandbox/include/asm/scmi_test.h
index 9b7031531..2930e686d 100644
--- a/arch/sandbox/include/asm/scmi_test.h
+++ b/arch/sandbox/include/asm/scmi_test.h
@@ -24,6 +24,7 @@  struct sandbox_scmi_clk {
 
 /**
  * struct sandbox_scmi_reset - Simulated reset controller exposed by SCMI
+ * @id:		Identifier of the reset controller used in the SCMI protocol
  * @asserted:	Reset control state: true if asserted, false if desasserted
  */
 struct sandbox_scmi_reset {
@@ -48,8 +49,8 @@  struct sandbox_scmi_voltd {
  * @idx:	Identifier for the SCMI agent, its index
  * @clk:	Simulated clocks
  * @clk_count:	Simulated clocks array size
- * @clk:	Simulated reset domains
- * @clk_count:	Simulated reset domains array size
+ * @reset:	Simulated reset domains
+ * @reset_count: Simulated reset domains array size
  * @voltd:	 Simulated voltage domains (regulators)
  * @voltd_count: Simulated voltage domains array size
  */
diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c
index 3eafc49bd..56125a57b 100644
--- a/drivers/firmware/scmi/sandbox-scmi_agent.c
+++ b/drivers/firmware/scmi/sandbox-scmi_agent.c
@@ -18,7 +18,7 @@ 
  * processing. It simulates few of the SCMI services for some of the
  * SCMI protocols embedded in U-Boot. Currently:
  * - SCMI clock protocol: emulate 2 agents each exposing few clocks
- * - SCMI reset protocol: emulate 1 agents each exposing a reset
+ * - SCMI reset protocol: emulate 1 agent exposing a reset controller
  * - SCMI voltage domain protocol: emulate 1 agent exposing 2 regulators
  *
  * Agent #0 simulates 2 clocks, 1 reset domain and 1 voltage domain.
@@ -29,7 +29,7 @@ 
  *
  * All clocks and regulators are default disabled and reset controller down.
  *
- * This Driver exports sandbox_scmi_service_ct() for the test sequence to
+ * This Driver exports sandbox_scmi_service_ctx() for the test sequence to
  * get the state of the simulated services (clock state, rate, ...) and
  * check back-end device state reflects the request send through the
  * various uclass devices, as clocks and reset controllers.
diff --git a/test/dm/scmi.c b/test/dm/scmi.c
index 792410338..2eaf06392 100644
--- a/test/dm/scmi.c
+++ b/test/dm/scmi.c
@@ -44,10 +44,8 @@  static int ut_assert_scmi_state_postprobe(struct unit_test_state *uts,
 	scmi_devices = sandbox_scmi_devices_ctx(dev);
 
 	ut_assertnonnull(scmi_devices);
-	if (IS_ENABLED(CONFIG_CLK_SCMI))
-		ut_asserteq(3, scmi_devices->clk_count);
-	if (IS_ENABLED(CONFIG_RESET_SCMI))
-		ut_asserteq(1, scmi_devices->reset_count);
+	ut_asserteq(3, scmi_devices->clk_count);
+	ut_asserteq(1, scmi_devices->reset_count);
 	ut_asserteq(2, scmi_devices->regul_count);
 
 	/* State of the simulated SCMI server exposed */
@@ -110,7 +108,6 @@  static int dm_test_scmi_sandbox_agent(struct unit_test_state *uts)
 
 	return ret;
 }
-
 DM_TEST(dm_test_scmi_sandbox_agent, UT_TESTF_SCAN_FDT);
 
 static int dm_test_scmi_clocks(struct unit_test_state *uts)
@@ -121,9 +118,6 @@  static int dm_test_scmi_clocks(struct unit_test_state *uts)
 	int ret_dev;
 	int ret;
 
-	if (!IS_ENABLED(CONFIG_CLK_SCMI))
-		return 0;
-
 	ret = load_sandbox_scmi_test_devices(uts, &dev);
 	if (ret)
 		return ret;
@@ -172,7 +166,6 @@  static int dm_test_scmi_clocks(struct unit_test_state *uts)
 
 	return release_sandbox_scmi_test_devices(uts, dev);
 }
-
 DM_TEST(dm_test_scmi_clocks, UT_TESTF_SCAN_FDT);
 
 static int dm_test_scmi_resets(struct unit_test_state *uts)
@@ -182,9 +175,6 @@  static int dm_test_scmi_resets(struct unit_test_state *uts)
 	struct udevice *dev = NULL;
 	int ret;
 
-	if (!IS_ENABLED(CONFIG_RESET_SCMI))
-		return 0;
-
 	ret = load_sandbox_scmi_test_devices(uts, &dev);
 	if (ret)
 		return ret;
@@ -203,7 +193,6 @@  static int dm_test_scmi_resets(struct unit_test_state *uts)
 
 	return release_sandbox_scmi_test_devices(uts, dev);
 }
-
 DM_TEST(dm_test_scmi_resets, UT_TESTF_SCAN_FDT);
 
 static int dm_test_scmi_voltage_domains(struct unit_test_state *uts)