[PATCH v2 3/7] reset_source: drop reset_source_set_instance()

[Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>]

The semantic of reset_source_set_instance() required a separate call to
reset_source_set() (or reset_source_set_priority()) and checked right
usage only using the type. Make the set of functions a bit easier to use
by dropping reset_source_set_instance() and instead introduce a function
that can set all relevant parameters (source, priority and instance) in
one go.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
---
 arch/arm/mach-imx/imx.c       |  4 +---
 common/reset_source.c         | 15 ++++-----------
 drivers/watchdog/stm32_iwdg.c |  3 +--
 include/reset_source.h        | 14 ++++++++++----
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index 63914d306e6f..43b540b39771 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -199,9 +199,7 @@ void imx_set_reset_reason(void __iomem *srsr,
 		}
 	}
 
-	reset_source_set_priority(type,
-				  RESET_SOURCE_DEFAULT_PRIORITY);
-	reset_source_set_instance(type, instance);
+	reset_source_set_prinst(type, RESET_SOURCE_DEFAULT_PRIORITY, instance);
 
 	pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n",
 		reset_source_name(), reg);
diff --git a/common/reset_source.c b/common/reset_source.c
index f400112483a5..f32b4eac2818 100644
--- a/common/reset_source.c
+++ b/common/reset_source.c
@@ -53,26 +53,20 @@ int reset_source_get_instance(void)
 }
 EXPORT_SYMBOL(reset_source_get_instance);
 
-void reset_source_set_priority(enum reset_src_type st, unsigned int priority)
+void reset_source_set_prinst(enum reset_src_type st,
+			     unsigned int priority, int instance)
 {
 	if (priority <= reset_source_priority)
 		return;
 
 	reset_source = st;
 	reset_source_priority = priority;
-	reset_source_instance = -1;
+	reset_source_instance = instance;
 
 	pr_debug("Setting reset source to %s with priority %d\n",
 			reset_src_names[reset_source], priority);
 }
-EXPORT_SYMBOL(reset_source_set_priority);
-
-void reset_source_set_instance(enum reset_src_type type, int instance)
-{
-	if (reset_source == type)
-		reset_source_instance = instance;
-}
-EXPORT_SYMBOL(reset_source_set_instance);
+EXPORT_SYMBOL(reset_source_set_prinst);
 
 static int reset_source_init(void)
 {
@@ -83,7 +77,6 @@ static int reset_source_init(void)
 				 "%d");
 	return 0;
 }
-
 coredevice_initcall(reset_source_init);
 
 /**
diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c
index 34912ae00eea..dbf776fa036c 100644
--- a/drivers/watchdog/stm32_iwdg.c
+++ b/drivers/watchdog/stm32_iwdg.c
@@ -187,8 +187,7 @@ static int stm32_set_reset_reason(struct regmap *rcc)
 		}
 	}
 
-	reset_source_set_priority(type, RESET_SOURCE_DEFAULT_PRIORITY);
-	reset_source_set_instance(type, instance);
+	reset_source_set_prinst(type, RESET_SOURCE_DEFAULT_PRIORITY, instance);
 
 	pr_info("STM32 RCC reset reason %s (MP_RSTSR: 0x%08x)\n",
 		reset_source_name(), reg);
diff --git a/include/reset_source.h b/include/reset_source.h
index 85329c8cea7a..22c51a0ea674 100644
--- a/include/reset_source.h
+++ b/include/reset_source.h
@@ -31,8 +31,8 @@ enum reset_src_type reset_source_get(void);
 const char *reset_source_name(void);
 int reset_source_get_instance(void);
 
-void reset_source_set_priority(enum reset_src_type, unsigned int priority);
-void reset_source_set_instance(enum reset_src_type type, int instance);
+void reset_source_set_prinst(enum reset_src_type,
+			     unsigned int priority, int instance);
 
 unsigned int of_get_reset_source_priority(struct device_node *node);
 
@@ -53,8 +53,8 @@ static inline int reset_source_get_instance(void)
 	return -1;
 }
 
-static inline void reset_source_set_priority(enum reset_src_type type,
-		unsigned int priority)
+static inline void reset_source_set_prinst(enum reset_src_type type,
+					   unsigned int priority, int instance)
 {
 }
 
@@ -70,6 +70,12 @@ static inline unsigned int of_get_reset_source_priority(struct device_node *node
 
 #define RESET_SOURCE_DEFAULT_PRIORITY 100
 
+static inline void reset_source_set_priority(enum reset_src_type type,
+					     unsigned int priority)
+{
+	reset_source_set_prinst(type, priority, -1);
+}
+
 static inline void reset_source_set(enum reset_src_type type)
 {
 	reset_source_set_priority(type, RESET_SOURCE_DEFAULT_PRIORITY);
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox