* [PATCH v2] reset: fix optional reset_control_get stubs to return NULL
@ 2017-03-20 11:17 ` Philipp Zabel
2017-03-20 13:41 ` Andrzej Hajda
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2017-03-20 11:17 UTC (permalink / raw
To: linux-kernel
Cc: Andrzej Hajda, Jaehoon Chung, Ulf Hansson, Philipp Zabel,
Ramiro Oliveira
When RESET_CONTROLLER is not enabled, the optional reset_control_get
stubs should now also return NULL.
Since it is now valid for reset_control_assert/deassert/reset/status/put
to be called unconditionally, with NULL as an argument for optional
resets, the stubs are not allowed to warn anymore.
Fixes: bb475230b8e5 ("reset: make optional functions really optional")
Reported-by: Andrzej Hajda <a.hajda@samsung.com>
Cc: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: Dropped WARN_ON(1) from the reset_control_* stubs
---
include/linux/reset.h | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/linux/reset.h b/include/linux/reset.h
index 86b4ed75359e8..96fb139bdd08f 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev)
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 int reset_control_status(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 __must_check device_reset(struct device *dev)
@@ -74,14 +69,14 @@ static inline struct reset_control *__of_reset_control_get(
const char *id, int index, bool shared,
bool optional)
{
- return ERR_PTR(-ENOTSUPP);
+ return optional ? NULL : ERR_PTR(-ENOTSUPP);
}
static inline struct reset_control *__devm_reset_control_get(
struct device *dev, const char *id,
int index, bool shared, bool optional)
{
- return ERR_PTR(-ENOTSUPP);
+ return optional ? NULL : ERR_PTR(-ENOTSUPP);
}
#endif /* CONFIG_RESET_CONTROLLER */
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] reset: fix optional reset_control_get stubs to return NULL
2017-03-20 11:17 ` [PATCH v2] reset: fix optional reset_control_get stubs to return NULL Philipp Zabel
@ 2017-03-20 13:41 ` Andrzej Hajda
0 siblings, 0 replies; 2+ messages in thread
From: Andrzej Hajda @ 2017-03-20 13:41 UTC (permalink / raw
To: Philipp Zabel, linux-kernel; +Cc: Jaehoon Chung, Ulf Hansson, Ramiro Oliveira
On 20.03.2017 12:17, Philipp Zabel wrote:
> When RESET_CONTROLLER is not enabled, the optional reset_control_get
> stubs should now also return NULL.
>
> Since it is now valid for reset_control_assert/deassert/reset/status/put
> to be called unconditionally, with NULL as an argument for optional
> resets, the stubs are not allowed to warn anymore.
>
> Fixes: bb475230b8e5 ("reset: make optional functions really optional")
> Reported-by: Andrzej Hajda <a.hajda@samsung.com>
> Cc: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Initially I though about replacing WARN_ON(1) with WARN_ON(rstc), but
maybe it is also OK.
Tested-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej
> ---
> v2: Dropped WARN_ON(1) from the reset_control_* stubs
> ---
> include/linux/reset.h | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/reset.h b/include/linux/reset.h
> index 86b4ed75359e8..96fb139bdd08f 100644
> --- a/include/linux/reset.h
> +++ b/include/linux/reset.h
> @@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev)
>
> 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 int reset_control_status(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 __must_check device_reset(struct device *dev)
> @@ -74,14 +69,14 @@ static inline struct reset_control *__of_reset_control_get(
> const char *id, int index, bool shared,
> bool optional)
> {
> - return ERR_PTR(-ENOTSUPP);
> + return optional ? NULL : ERR_PTR(-ENOTSUPP);
> }
>
> static inline struct reset_control *__devm_reset_control_get(
> struct device *dev, const char *id,
> int index, bool shared, bool optional)
> {
> - return ERR_PTR(-ENOTSUPP);
> + return optional ? NULL : ERR_PTR(-ENOTSUPP);
> }
>
> #endif /* CONFIG_RESET_CONTROLLER */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-20 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20170320111802epcas4p4357f7d841345b3a61d25eeaa0ee74637@epcas4p4.samsung.com>
2017-03-20 11:17 ` [PATCH v2] reset: fix optional reset_control_get stubs to return NULL Philipp Zabel
2017-03-20 13:41 ` Andrzej Hajda
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.