sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

reset: Allow dummy reset lines 

Treat NULL as a dummy reset line which is returned by the reset core
when there is no reset line connected to a device (that is, no
reset is described in the device tree). With this consumers can
just use the reset functions without having to check for existence.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-11-20 13:39:50 +01:00
parent b9170a1bde
commit 00c8cfb3e9
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/reset/core.c
View File

@ -84,6 +84,9 @@ EXPORT_SYMBOL_GPL(reset_controller_unregister);
*/
int reset_control_reset(struct reset_control *rstc)
{
if (!rstc)
return 0;
if (rstc->rcdev->ops->reset)
return rstc->rcdev->ops->reset(rstc->rcdev, rstc->id);
@ -97,6 +100,9 @@ EXPORT_SYMBOL_GPL(reset_control_reset);
*/
int reset_control_assert(struct reset_control *rstc)
{
if (!rstc)
return 0;
if (rstc->rcdev->ops->assert)
return rstc->rcdev->ops->assert(rstc->rcdev, rstc->id);
@ -110,6 +116,9 @@ EXPORT_SYMBOL_GPL(reset_control_assert);
*/
int reset_control_deassert(struct reset_control *rstc)
{
if (!rstc)
return 0;
if (rstc->rcdev->ops->deassert)
return rstc->rcdev->ops->deassert(rstc->rcdev, rstc->id);
@ -136,6 +145,9 @@ struct reset_control *of_reset_control_get(struct device_node *node,
int rstc_id;
int ret;
if (!of_get_property(node, "resets", NULL))
return NULL;
if (id)
index = of_property_match_string(node,
"reset-names", id);
@ -188,8 +200,13 @@ struct reset_control *reset_control_get(struct device_d *dev, const char *id)
return ERR_PTR(-EINVAL);
rstc = of_reset_control_get(dev->device_node, id);
if (!IS_ERR(rstc))
rstc->dev = dev;
if (IS_ERR(rstc))
return ERR_CAST(rstc);
if (!rstc)
return NULL;
rstc->dev = dev;
return rstc;
}
@ -202,7 +219,7 @@ EXPORT_SYMBOL_GPL(reset_control_get);
void reset_control_put(struct reset_control *rstc)
{
if (IS_ERR(rstc))
if (IS_ERR_OR_NULL(rstc))
return;
kfree(rstc);