[PATCH] reset: Add optional resets and stubs

[PATCH] reset: Add optional resets and stubs

[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

Re: [PATCH] reset: Add optional resets and stubs

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

On Fri, Mar 07, 2014 at 03:30:23PM +0100, Philipp Zabel wrote:
> 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>

Yay, thanks for fixing that! Do you pick it up yourself?


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] reset: Add optional resets and stubs

[Philipp Zabel]

Hi Wolfram,

Am Freitag, den 07.03.2014, 16:39 +0100 schrieb Wolfram Sang:
> On Fri, Mar 07, 2014 at 03:30:23PM +0100, Philipp Zabel wrote:
> > 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>
> 
> Yay, thanks for fixing that! Do you pick it up yourself?

yes, I can do that.
Does this work for all interested parties?

regards
Philipp

Re: [PATCH] reset: Add optional resets and stubs

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

Hi Philipp, 

On Fri, Mar 07, 2014 at 03:30:23PM +0100, Philipp Zabel wrote:
> 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>

Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] reset: Add optional resets and stubs

[Marek Vasut]

On Friday, March 07, 2014 at 03:30:23 PM, Philipp Zabel wrote:
> 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>

Nice.

Reviewed-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut

Re: [PATCH] reset: Add optional resets and stubs

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

On Fri, Mar 07, 2014 at 03:30:23PM +0100, Philipp Zabel wrote:
> 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>

Acked-by: Wolfram Sang <wsa@the-dreams.de>


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] reset: Add optional resets and stubs

[Ivan T. Ivanov]

On 03/07/14 16:30, Philipp Zabel wrote:
> 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>

Thanks.

Reviewed-by: Ivan T. Ivanov <iivanov@mm-sol.com>