public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] reset: Add optional resets and stubs
@ 2014-03-07 14:30 Philipp Zabel
  2014-03-07 15:39 ` Wolfram Sang
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Philipp Zabel @ 2014-03-07 14:30 UTC (permalink / raw)
  To: linux-kernel
  Cc: Wolfram Sang, Chen-Yu Tsai, Ivan T. Ivanov, Barry Song,
	Stephen Warren, Pavel Machek, Shawn Guo, Marek Vasut,
	Stephen Warren, Maxime Ripard, kernel, Philipp Zabel

This patch adds device_reset_optional and (devm_)reset_control_get_optional
variants that drivers can use to indicate they can function without control
over the reset line. For those functions, stubs are added so the drivers can
be compiled with CONFIG_RESET_CONTROLLER disabled.
Also, device_reset is annotated with __must_check. Drivers ignoring the return
value should use device_reset_optional instead.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 include/linux/reset.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 7 deletions(-)

diff --git a/include/linux/reset.h b/include/linux/reset.h
index 10c44ab..c0eda50 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -1,23 +1,80 @@
 #ifndef _LINUX_RESET_H_
 #define _LINUX_RESET_H_
 
-#include <linux/of.h>
-
 struct device;
 struct reset_control;
 
+#ifdef CONFIG_RESET_CONTROLLER
+
 int reset_control_reset(struct reset_control *rstc);
-int reset_control_reset_udelay(struct reset_control *rstc, unsigned long usecs);
-int reset_control_reset_msleep(struct reset_control *rstc, unsigned long msecs);
 int reset_control_assert(struct reset_control *rstc);
 int reset_control_deassert(struct reset_control *rstc);
 
-struct reset_control *of_reset_control_get(struct device_node *node,
-					   const char *id);
 struct reset_control *reset_control_get(struct device *dev, const char *id);
 void reset_control_put(struct reset_control *rstc);
 struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
 
-int device_reset(struct device *dev);
+int __must_check device_reset(struct device *dev);
+
+static inline int device_reset_optional(struct device *dev)
+{
+	return device_reset(dev);
+}
+
+static inline struct reset_control *reset_control_get_optional(
+					struct device *dev, const char *id)
+{
+	return reset_control_get(dev, id);
+}
+
+static inline struct reset_control *devm_reset_control_get_optional(
+					struct device *dev, const char *id)
+{
+	return devm_reset_control_get(dev, id);
+}
+
+#else
+
+static inline int reset_control_reset(struct reset_control *rstc)
+{
+	WARN_ON(1);
+	return 0;
+}
+
+static inline int reset_control_assert(struct reset_control *rstc)
+{
+	WARN_ON(1);
+	return 0;
+}
+
+static inline int reset_control_deassert(struct reset_control *rstc)
+{
+	WARN_ON(1);
+	return 0;
+}
+
+static inline void reset_control_put(struct reset_control *rstc)
+{
+	WARN_ON(1);
+}
+
+static inline int device_reset_optional(struct device *dev)
+{
+	return -ENOSYS;
+}
+
+static inline struct reset_control *reset_control_get_optional(
+					struct device *dev, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static inline struct reset_control *devm_reset_control_get_optional(
+					struct device *dev, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+#endif /* CONFIG_RESET_CONTROLLER */
 
 #endif
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-10  9:41 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-07 14:30 [PATCH] reset: Add optional resets and stubs Philipp Zabel
2014-03-07 15:39 ` Wolfram Sang
2014-03-07 17:06   ` Philipp Zabel
2014-03-07 17:57 ` Maxime Ripard
2014-03-08 11:38 ` Marek Vasut
2014-03-08 22:34 ` Wolfram Sang
2014-03-10  9:39 ` Ivan T. Ivanov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox