reset: Add of_reset_control_get to reset.h

PATCH New Hans de Goede 4 participants 5 messages Apr 13, 2014 – Apr 30, 2014 Reset controller framework

Share & tools

Hans de Goede

author

2014-04-13 12:09 UTC #0 lore raw

PATCH 1/1 reset: Add of_reset_control_get to reset.h

of_reset_control_get is not declared static in drivers/reset/core.c, which is correct as we want to use it elsewhere too. But it does not have a protype declared anywhere under include/linux. Add a prototype / stub for it to linux/reset.h to fix this.

Signed-off-by Hans de Goede <[email protected]>

---
 include/linux/reset.h | 9 +++++++++
 1 file changed, 9 insertions(+)

include/linux/reset.h +9 -0

index c0eda50..f1ae7ce 100644
@@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return devm_reset_control_get(dev, id);
 }
 
+struct reset_control *of_reset_control_get(struct device_node *node,
+					   const char *id);
+
 #else
 
 static inline int reset_control_reset(struct reset_control *rstc)

@@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct reset_control *of_reset_control_get(
+				struct device_node *node, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 #endif /* CONFIG_RESET_CONTROLLER */
 
 #endif

Signature · 1 line

1.9.0

Josh Triplett

2014-04-13 12:47 UTC #1 lore raw

PATCH 1/1 reset: Add of_reset_control_get to reset.h

Quoted 6 lines · Hans de Goede

of_reset_control_get is not declared static in drivers/reset/core.c, which is correct as we want to use it elsewhere too. But it does not have a protype declared anywhere under include/linux. Add a prototype / stub for it to linux/reset.h to fix this.
Signed-off-by Hans de Goede <[email protected]>

Reviewed-by Josh Triplett <[email protected]>

Quoted 33 lines

 include/linux/reset.h | 9 +++++++++
 1 file changed, 9 insertions(+)

include/linux/reset.h +9 -0

index c0eda50..f1ae7ce 100644
@@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return devm_reset_control_get(dev, id);
 }
 
+struct reset_control *of_reset_control_get(struct device_node *node,
+					   const char *id);
+
 #else
 
 static inline int reset_control_reset(struct reset_control *rstc)

@@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct reset_control *of_reset_control_get(
+				struct device_node *node, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 #endif /* CONFIG_RESET_CONTROLLER */
 
 #endif

Signature · 1 line

1.9.0

Philipp Zabel

maintainer Applied

2014-04-14 07:58 UTC #2 lore raw

PATCH 1/1 reset: Add of_reset_control_get to reset.h

In reply to Hans de Goede

Am Sonntag, den 13.04.2014, 14:09 +0200 schrieb Hans de Goede:

Quoted 27 lines

of_reset_control_get is not declared static in drivers/reset/core.c, which is correct as we want to use it elsewhere too. But it does not have a protype declared anywhere under include/linux. Add a prototype / stub for it to linux/reset.h to fix this.
Signed-off-by Hans de Goede <[email protected]>
---
 include/linux/reset.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/reset.h +3 -0
index c0eda50..f1ae7ce 100644
@@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return devm_reset_control_get(dev, id);
 }
 
+struct reset_control *of_reset_control_get(struct device_node *node,
+					   const char *id);
+
 #else
 
 static inline int reset_control_reset(struct reset_control *rstc)
@@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return ERR_PTR(-ENOSYS);
 }

include/linux/reset.h static inline struct reset_control *devm_reset_control_get_optional( · line 89

Quoted 10 lines

include/linux/reset.h +6 -0

 
+static inline struct reset_control *of_reset_control_get(
+				struct device_node *node, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 #endif /* CONFIG_RESET_CONTROLLER */
 
 #endif

Applied, thanks.

regards
Philipp

Maxime Ripard

2014-04-23 12:27 UTC #3 lore raw

PATCH 1/1 reset: Add of_reset_control_get to reset.h

Hi Philipp,

Quoted 37 lines · Philipp Zabel

Am Sonntag, den 13.04.2014, 14:09 +0200 schrieb Hans de Goede:
Quoted 36 lines
of_reset_control_get is not declared static in drivers/reset/core.c, which is correct as we want to use it elsewhere too. But it does not have a protype declared anywhere under include/linux. Add a prototype / stub for it to linux/reset.h to fix this.
Signed-off-by Hans de Goede <[email protected]>
---
 include/linux/reset.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/reset.h +9 -0
index c0eda50..f1ae7ce 100644
@@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return devm_reset_control_get(dev, id);
 }
 
+struct reset_control *of_reset_control_get(struct device_node *node,
+					   const char *id);
+
 #else
 
 static inline int reset_control_reset(struct reset_control *rstc)
@@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct reset_control *of_reset_control_get(
+				struct device_node *node, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 #endif /* CONFIG_RESET_CONTROLLER */
 

Quoted 3 lines

include/linux/reset.h static inline struct reset_control *devm_reset_control_get_optional( · line 89
Quoted 1 line
include/linux/reset.h +0 -0
 #endif
Applied, thanks.

I just noticed you queued this patch up for 3.16.

Since that function got introduced in 3.15-rc1, maybe it would be better if you queued it for one of 3.15-rc* ?

Thanks,
Maxime

Signature · 10 lines

Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140423/e3d3819a/attachment.sig>

Philipp Zabel

maintainer

2014-04-30 08:29 UTC #4 lore raw

PATCH 1/1 reset: Add of_reset_control_get to reset.h

Hi Maxime,

Am Mittwoch, den 23.04.2014, 14:27 +0200 schrieb Maxime Ripard:

Quoted 38 lines · Philipp Zabel

Quoted 37 lines
Am Sonntag, den 13.04.2014, 14:09 +0200 schrieb Hans de Goede:
Quoted 36 lines
of_reset_control_get is not declared static in drivers/reset/core.c, which is correct as we want to use it elsewhere too. But it does not have a protype declared anywhere under include/linux. Add a prototype / stub for it to linux/reset.h to fix this.
Signed-off-by Hans de Goede <[email protected]>
---
 include/linux/reset.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/reset.h +9 -0
index c0eda50..f1ae7ce 100644
@@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return devm_reset_control_get(dev, id);
 }
 
+struct reset_control *of_reset_control_get(struct device_node *node,
+					   const char *id);
+
 #else
 
 static inline int reset_control_reset(struct reset_control *rstc)
@@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct reset_control *of_reset_control_get(
+				struct device_node *node, const char *id)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 #endif /* CONFIG_RESET_CONTROLLER */
 

Quoted 8 lines

Quoted 3 lines
include/linux/reset.h static inline struct reset_control *devm_reset_control_get_optional( · line 89
Quoted 1 line
include/linux/reset.h +0 -0
 #endif
Applied, thanks.
I just noticed you queued this patch up for 3.16.
Since that function got introduced in 3.15-rc1, maybe it would be better if you queued it for one of 3.15-rc* ?

Good point, this is the first reset framework patch that should actually be fast-tracked.

regards
Philipp