path: root/drivers/reset
diff options
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-10-29 01:50:06 +0900
committerPhilipp Zabel <p.zabel@pengutronix.de>2017-11-27 09:16:39 +0100
commit1554bbd4ad401b7f0f916c0891874111c10befe5 (patch)
tree3cedce90a68898d0d9462957ea24eb59bb778ffc /drivers/reset
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
reset: make device_reset_optional() really optional
Commit bb475230b8e5 ("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>
Diffstat (limited to 'drivers/reset')
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 1d21c6f7d56c..da4292e9de97 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -566,17 +566,18 @@ EXPORT_SYMBOL_GPL(__devm_reset_control_get);
* device_reset - find reset controller associated with the device
* and perform reset
* @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
* lines.
-int device_reset(struct device *dev)
+int __device_reset(struct device *dev, bool optional)
struct reset_control *rstc;
int ret;
- rstc = reset_control_get(dev, NULL);
+ rstc = __reset_control_get(dev, NULL, 0, 0, optional);
if (IS_ERR(rstc))
return PTR_ERR(rstc);
@@ -586,7 +587,7 @@ int device_reset(struct device *dev)
return ret;
* APIs to manage an array of reset controls.

Privacy Policy