[PATCH] reset: Add (devm_)reset_control_get stub functions

[PATCH] reset: Add (devm_)reset_control_get stub functions

[Axel Lin]

So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 include/linux/reset.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/linux/reset.h b/include/linux/reset.h
index da5602b..cd42c1b 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -74,6 +74,18 @@ static inline int device_reset_optional(struct device *dev)
 	return -ENOSYS;
 }
 
+static inline struct reset_control *reset_control_get(
+					struct device *dev, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static inline struct reset_control *devm_reset_control_get(
+					struct device *dev, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 static inline struct reset_control *reset_control_get_optional(
 					struct device *dev, const char *id)
 {
-- 
2.1.0

Re: [PATCH] reset: Add (devm_)reset_control_get stub functions

[Mark Brown]

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

On Mon, Aug 31, 2015 at 05:22:23PM +0800, Axel Lin wrote:

> So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.

The lack of this is breaking the build for the newly added ASoC STI
driver in some COMPILE_TEST configurations, can we please get this in
for v4.3-rc1?

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

Re: [PATCH] reset: Add (devm_)reset_control_get stub functions

[Philipp Zabel]

Hi Axel,

thank you for the patch.

Am Montag, den 31.08.2015, 17:22 +0800 schrieb Axel Lin:
> So the drivers can be compiled with CONFIG_RESET_CONTROLLER disabled.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
>  include/linux/reset.h | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/include/linux/reset.h b/include/linux/reset.h
> index da5602b..cd42c1b 100644
> --- a/include/linux/reset.h
> +++ b/include/linux/reset.h
> @@ -74,6 +74,18 @@ static inline int device_reset_optional(struct device *dev)
>  	return -ENOSYS;
>  }
>  
> +static inline struct reset_control *reset_control_get(
> +					struct device *dev, const char *id)
> +{
> +	return ERR_PTR(-ENOSYS);
> +}
> +
> +static inline struct reset_control *devm_reset_control_get(
> +					struct device *dev, const char *id)
> +{
> +	return ERR_PTR(-ENOSYS);
> +}
> +

Could you add a WARN_ON(1) to both, make them __must_check, and return
something other than -ENOSYS. For example the gpio stubs return -EINVAL.

regards
Philipp