malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reset: fix optional reset_control_get stubs to return NULL

Browse Source 
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>
Tested-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Cc: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2017-03-20 11:25:16 +01:00
parent c1ae3cfa0e
commit 0ca10b60ce
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/reset.h
View File

@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev)
static inline int reset_control_reset(struct reset_control *rstc) static inline int reset_control_reset(struct reset_control *rstc)
{ {
WARN_ON(1);
return 0; return 0;
} }
static inline int reset_control_assert(struct reset_control *rstc) static inline int reset_control_assert(struct reset_control *rstc)
{ {
WARN_ON(1);
return 0; return 0;
} }
static inline int reset_control_deassert(struct reset_control *rstc) static inline int reset_control_deassert(struct reset_control *rstc)
{ {
WARN_ON(1);
return 0; return 0;
} }
static inline int reset_control_status(struct reset_control *rstc) static inline int reset_control_status(struct reset_control *rstc)
{ {
WARN_ON(1);
return 0; return 0;
} }
static inline void reset_control_put(struct reset_control *rstc) static inline void reset_control_put(struct reset_control *rstc)
{ {
WARN_ON(1);
} }
static inline int __must_check device_reset(struct device *dev) 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, const char *id, int index, bool shared,
bool optional) bool optional)
{ {
return ERR_PTR(-ENOTSUPP); return optional ? NULL : ERR_PTR(-ENOTSUPP);
} }
static inline struct reset_control *__devm_reset_control_get( static inline struct reset_control *__devm_reset_control_get(
struct device *dev, const char *id, struct device *dev, const char *id,
int index, bool shared, bool optional) int index, bool shared, bool optional)
{ {
return ERR_PTR(-ENOTSUPP); return optional ? NULL : ERR_PTR(-ENOTSUPP);
} }
#endif /* CONFIG_RESET_CONTROLLER */ #endif /* CONFIG_RESET_CONTROLLER */