lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] reset: fix optional reset_control_get stubs to return NULL
Date
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
\
 
 \ /
  Last update: 2017-03-20 12:19    [W:0.035 / U:14.052 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site