Commit 62e24c57 authored by Philipp Zabel's avatar Philipp Zabel

reset: add exported __reset_control_get, return NULL if optional

Rename the internal __reset_control_get/put functions to
__reset_control_get/put_internal and add an exported
__reset_control_get equivalent to __of_reset_control_get
that takes a struct device parameter.
This avoids the confusing call to __of_reset_control_get in
the non-DT case and fixes the devm_reset_control_get_optional
function to return NULL if RESET_CONTROLLER is enabled but
dev->of_node == NULL.

Fixes: bb475230 ("reset: make optional functions really optional")
Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 0ca10b60
...@@ -275,7 +275,7 @@ int reset_control_status(struct reset_control *rstc) ...@@ -275,7 +275,7 @@ int reset_control_status(struct reset_control *rstc)
} }
EXPORT_SYMBOL_GPL(reset_control_status); EXPORT_SYMBOL_GPL(reset_control_status);
static struct reset_control *__reset_control_get( static struct reset_control *__reset_control_get_internal(
struct reset_controller_dev *rcdev, struct reset_controller_dev *rcdev,
unsigned int index, bool shared) unsigned int index, bool shared)
{ {
...@@ -308,7 +308,7 @@ static struct reset_control *__reset_control_get( ...@@ -308,7 +308,7 @@ static struct reset_control *__reset_control_get(
return rstc; return rstc;
} }
static void __reset_control_put(struct reset_control *rstc) static void __reset_control_put_internal(struct reset_control *rstc)
{ {
lockdep_assert_held(&reset_list_mutex); lockdep_assert_held(&reset_list_mutex);
...@@ -377,7 +377,7 @@ struct reset_control *__of_reset_control_get(struct device_node *node, ...@@ -377,7 +377,7 @@ struct reset_control *__of_reset_control_get(struct device_node *node,
} }
/* reset_list_mutex also protects the rcdev's reset_control list */ /* reset_list_mutex also protects the rcdev's reset_control list */
rstc = __reset_control_get(rcdev, rstc_id, shared); rstc = __reset_control_get_internal(rcdev, rstc_id, shared);
mutex_unlock(&reset_list_mutex); mutex_unlock(&reset_list_mutex);
...@@ -385,6 +385,17 @@ struct reset_control *__of_reset_control_get(struct device_node *node, ...@@ -385,6 +385,17 @@ struct reset_control *__of_reset_control_get(struct device_node *node,
} }
EXPORT_SYMBOL_GPL(__of_reset_control_get); EXPORT_SYMBOL_GPL(__of_reset_control_get);
struct reset_control *__reset_control_get(struct device *dev, const char *id,
int index, bool shared, bool optional)
{
if (dev->of_node)
return __of_reset_control_get(dev->of_node, id, index, shared,
optional);
return optional ? NULL : ERR_PTR(-EINVAL);
}
EXPORT_SYMBOL_GPL(__reset_control_get);
/** /**
* reset_control_put - free the reset controller * reset_control_put - free the reset controller
* @rstc: reset controller * @rstc: reset controller
...@@ -396,7 +407,7 @@ void reset_control_put(struct reset_control *rstc) ...@@ -396,7 +407,7 @@ void reset_control_put(struct reset_control *rstc)
return; return;
mutex_lock(&reset_list_mutex); mutex_lock(&reset_list_mutex);
__reset_control_put(rstc); __reset_control_put_internal(rstc);
mutex_unlock(&reset_list_mutex); mutex_unlock(&reset_list_mutex);
} }
EXPORT_SYMBOL_GPL(reset_control_put); EXPORT_SYMBOL_GPL(reset_control_put);
...@@ -417,8 +428,7 @@ struct reset_control *__devm_reset_control_get(struct device *dev, ...@@ -417,8 +428,7 @@ struct reset_control *__devm_reset_control_get(struct device *dev,
if (!ptr) if (!ptr)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
rstc = __of_reset_control_get(dev ? dev->of_node : NULL, rstc = __reset_control_get(dev, id, index, shared, optional);
id, index, shared, optional);
if (!IS_ERR(rstc)) { if (!IS_ERR(rstc)) {
*ptr = rstc; *ptr = rstc;
devres_add(dev, ptr); devres_add(dev, ptr);
......
...@@ -15,6 +15,9 @@ int reset_control_status(struct reset_control *rstc); ...@@ -15,6 +15,9 @@ int reset_control_status(struct reset_control *rstc);
struct reset_control *__of_reset_control_get(struct device_node *node, struct reset_control *__of_reset_control_get(struct device_node *node,
const char *id, int index, bool shared, const char *id, int index, bool shared,
bool optional); bool optional);
struct reset_control *__reset_control_get(struct device *dev, const char *id,
int index, bool shared,
bool optional);
void reset_control_put(struct reset_control *rstc); void reset_control_put(struct reset_control *rstc);
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,
...@@ -72,6 +75,13 @@ static inline struct reset_control *__of_reset_control_get( ...@@ -72,6 +75,13 @@ static inline struct reset_control *__of_reset_control_get(
return optional ? NULL : ERR_PTR(-ENOTSUPP); return optional ? NULL : ERR_PTR(-ENOTSUPP);
} }
static inline struct reset_control *__reset_control_get(
struct device *dev, const char *id,
int index, bool shared, bool optional)
{
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)
...@@ -102,8 +112,7 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id) ...@@ -102,8 +112,7 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id)
#ifndef CONFIG_RESET_CONTROLLER #ifndef CONFIG_RESET_CONTROLLER
WARN_ON(1); WARN_ON(1);
#endif #endif
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false, return __reset_control_get(dev, id, 0, false, false);
false);
} }
/** /**
...@@ -131,22 +140,19 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id) ...@@ -131,22 +140,19 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id)
static inline struct reset_control *reset_control_get_shared( static inline struct reset_control *reset_control_get_shared(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true, return __reset_control_get(dev, id, 0, true, false);
false);
} }
static inline struct reset_control *reset_control_get_optional_exclusive( static inline struct reset_control *reset_control_get_optional_exclusive(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false, return __reset_control_get(dev, id, 0, false, true);
true);
} }
static inline struct reset_control *reset_control_get_optional_shared( static inline struct reset_control *reset_control_get_optional_shared(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true, return __reset_control_get(dev, id, 0, true, true);
true);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment