iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset: make device_reset_optional() really optional

Browse Source 
Commit bb475230b8 ("reset: make optional functions really optional")
converted *_get_optional* functions, but device_reset_optional() was
left behind.  Convert it in the same way.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Masahiro Yamada 2017-10-29 01:50:06 +09:00 committed by Philipp Zabel
parent 4fbd8d194f
commit 1554bbd4ad
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/reset/core.c
View File

@ -566,17 +566,18 @@ EXPORT_SYMBOL_GPL(__devm_reset_control_get);
* device_reset - find reset controller associated with the device * device_reset - find reset controller associated with the device
* and perform reset * and perform reset
* @dev: device to be reset by the controller * @dev: device to be reset by the controller
* @optional: whether it is optional to reset the device
* *
* Convenience wrapper for reset_control_get() and reset_control_reset(). * Convenience wrapper for __reset_control_get() and reset_control_reset().
* This is useful for the common case of devices with single, dedicated reset * This is useful for the common case of devices with single, dedicated reset
* lines. * lines.
*/ */
int device_reset(struct device *dev) int __device_reset(struct device *dev, bool optional)
{ {
struct reset_control *rstc; struct reset_control *rstc;
int ret; int ret;
rstc = reset_control_get(dev, NULL); rstc = __reset_control_get(dev, NULL, 0, 0, optional);
if (IS_ERR(rstc)) if (IS_ERR(rstc))
return PTR_ERR(rstc); return PTR_ERR(rstc);
@ -586,7 +587,7 @@ int device_reset(struct device *dev)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(device_reset); EXPORT_SYMBOL_GPL(__device_reset);
/** /**
* APIs to manage an array of reset controls. * APIs to manage an array of reset controls.

28
include/linux/reset.h
View File

@ -20,22 +20,16 @@ struct reset_control *__reset_control_get(struct device *dev, const char *id,
int index, bool shared, int index, bool shared,
bool optional); bool optional);
void reset_control_put(struct reset_control *rstc); void reset_control_put(struct reset_control *rstc);
int __device_reset(struct device *dev, bool optional);
struct reset_control *__devm_reset_control_get(struct device *dev, struct reset_control *__devm_reset_control_get(struct device *dev,
const char *id, int index, bool shared, const char *id, int index, bool shared,
bool optional); bool optional);
int __must_check device_reset(struct device *dev);
struct reset_control *devm_reset_control_array_get(struct device *dev, struct reset_control *devm_reset_control_array_get(struct device *dev,
bool shared, bool optional); bool shared, bool optional);
struct reset_control *of_reset_control_array_get(struct device_node *np, struct reset_control *of_reset_control_array_get(struct device_node *np,
bool shared, bool optional); bool shared, bool optional);
static inline int device_reset_optional(struct device *dev)
{
return device_reset(dev);
}
#else #else
static inline int reset_control_reset(struct reset_control *rstc) static inline int reset_control_reset(struct reset_control *rstc)
@ -62,15 +56,9 @@ static inline void reset_control_put(struct reset_control *rstc)
{ {
} }
static inline int __must_check device_reset(struct device *dev) static inline int __device_reset(struct device *dev, bool optional)
{ {
WARN_ON(1); return optional ? 0 : -ENOTSUPP;
return -ENOTSUPP;
}
static inline int device_reset_optional(struct device *dev)
{
return -ENOTSUPP;
} }
static inline struct reset_control *__of_reset_control_get( static inline struct reset_control *__of_reset_control_get(
@ -109,6 +97,16 @@ of_reset_control_array_get(struct device_node *np, bool shared, bool optional)
#endif /* CONFIG_RESET_CONTROLLER */ #endif /* CONFIG_RESET_CONTROLLER */
static inline int __must_check device_reset(struct device *dev)
{
return __device_reset(dev, false);
}
static inline int device_reset_optional(struct device *dev)
{
return __device_reset(dev, true);
}
/** /**
* reset_control_get_exclusive - Lookup and obtain an exclusive reference * reset_control_get_exclusive - Lookup and obtain an exclusive reference
* to a reset controller. * to a reset controller.