| Message ID | 1421216372-8025-2-git-send-email-vinceh@nvidia.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, Jan 14, 2015 at 3:19 PM, Vince Hsu <vinceh@nvidia.com> wrote: > Add of_reset_control_get_by_index() to allow the dirvers to get reset device s/dirvers/drivers > without knowing its name. > > Signed-off-by: Vince Hsu <vinceh@nvidia.com> > --- > drivers/reset/core.c | 47 ++++++++++++++++++++++++++++++++--------------- > include/linux/reset.h | 9 +++++++++ > 2 files changed, 41 insertions(+), 15 deletions(-) > > diff --git a/drivers/reset/core.c b/drivers/reset/core.c > index 7955e00d04d4..25a0da1654f8 100644 > --- a/drivers/reset/core.c > +++ b/drivers/reset/core.c > @@ -140,28 +140,15 @@ int reset_control_status(struct reset_control *rstc) > } > EXPORT_SYMBOL_GPL(reset_control_status); > > -/** > - * of_reset_control_get - Lookup and obtain a reference to a reset controller. > - * @node: device to be reset by the controller > - * @id: reset line name > - * > - * Returns a struct reset_control or IS_ERR() condition containing errno. > - * > - * Use of id names is optional. > - */ > -struct reset_control *of_reset_control_get(struct device_node *node, > - const char *id) > +struct reset_control *__of_reset_control_get(struct device_node *node, > + int index) > { > struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER); > struct reset_controller_dev *r, *rcdev; > struct of_phandle_args args; > - int index = 0; > int rstc_id; > int ret; > > - if (id) > - index = of_property_match_string(node, > - "reset-names", id); > ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", > index, &args); > if (ret) > @@ -202,6 +189,36 @@ struct reset_control *of_reset_control_get(struct device_node *node, > > return rstc; > } > + > +struct reset_control *of_reset_control_get_by_index(struct device_node *node, > + int index) > +{ > + if (!node) > + return ERR_PTR(-EINVAL); Here you are checking node... > + > + return __of_reset_control_get(node, index); > +} > +EXPORT_SYMBOL_GPL(of_reset_control_get_by_index); > + > +/** > + * of_reset_control_get - Lookup and obtain a reference to a reset controller. > + * @node: device to be reset by the controller > + * @id: reset line name > + * > + * Returns a struct reset_control or IS_ERR() condition containing errno. > + * > + * Use of id names is optional. > + */ > +struct reset_control *of_reset_control_get(struct device_node *node, > + const char *id) > +{ > + int index = 0; > + > + if (id) > + index = of_property_match_string(node, > + "reset-names", id); > + return __of_reset_control_get(node, index); ... but not here? > +} > EXPORT_SYMBOL_GPL(of_reset_control_get); > > /** > diff --git a/include/linux/reset.h b/include/linux/reset.h > index da5602bd77d7..f29fc88c4868 100644 > --- a/include/linux/reset.h > +++ b/include/linux/reset.h > @@ -38,6 +38,9 @@ static inline struct reset_control *devm_reset_control_get_optional( > struct reset_control *of_reset_control_get(struct device_node *node, > const char *id); > > +struct reset_control *of_reset_control_get_by_index( > + struct device_node *node, int index); > + > #else > > static inline int reset_control_reset(struct reset_control *rstc) > @@ -92,6 +95,12 @@ static inline struct reset_control *of_reset_control_get( > return ERR_PTR(-ENOSYS); > } > > +struct reset_control *of_reset_control_get_by_index( > + struct device_node *node, int index) Seems like the node argument would fit on the previous line. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 02/12/2015 04:56 PM, Alexandre Courbot wrote: > On Wed, Jan 14, 2015 at 3:19 PM, Vince Hsu<vinceh@nvidia.com> wrote: >> Add of_reset_control_get_by_index() to allow the dirvers to get reset device > s/dirvers/drivers > >> without knowing its name. >> >> Signed-off-by: Vince Hsu<vinceh@nvidia.com> >> --- >> drivers/reset/core.c | 47 ++++++++++++++++++++++++++++++++--------------- >> include/linux/reset.h | 9 +++++++++ >> 2 files changed, 41 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/reset/core.c b/drivers/reset/core.c >> index 7955e00d04d4..25a0da1654f8 100644 >> --- a/drivers/reset/core.c >> +++ b/drivers/reset/core.c >> @@ -140,28 +140,15 @@ int reset_control_status(struct reset_control *rstc) >> } >> EXPORT_SYMBOL_GPL(reset_control_status); >> >> -/** >> - * of_reset_control_get - Lookup and obtain a reference to a reset controller. >> - * @node: device to be reset by the controller >> - * @id: reset line name >> - * >> - * Returns a struct reset_control or IS_ERR() condition containing errno. >> - * >> - * Use of id names is optional. >> - */ >> -struct reset_control *of_reset_control_get(struct device_node *node, >> - const char *id) >> +struct reset_control *__of_reset_control_get(struct device_node *node, >> + int index) >> { >> struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER); >> struct reset_controller_dev *r, *rcdev; >> struct of_phandle_args args; >> - int index = 0; >> int rstc_id; >> int ret; >> >> - if (id) >> - index = of_property_match_string(node, >> - "reset-names", id); >> ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", >> index, &args); >> if (ret) >> @@ -202,6 +189,36 @@ struct reset_control *of_reset_control_get(struct device_node *node, >> >> return rstc; >> } >> + >> +struct reset_control *of_reset_control_get_by_index(struct device_node *node, >> + int index) >> +{ >> + if (!node) >> + return ERR_PTR(-EINVAL); > Here you are checking node... Will drop the check here. It's not needed actually. >> + >> + return __of_reset_control_get(node, index); >> +} >> +EXPORT_SYMBOL_GPL(of_reset_control_get_by_index); >> + >> +/** >> + * of_reset_control_get - Lookup and obtain a reference to a reset controller. >> + * @node: device to be reset by the controller >> + * @id: reset line name >> + * >> + * Returns a struct reset_control or IS_ERR() condition containing errno. >> + * >> + * Use of id names is optional. >> + */ >> +struct reset_control *of_reset_control_get(struct device_node *node, >> + const char *id) >> +{ >> + int index = 0; >> + >> + if (id) >> + index = of_property_match_string(node, >> + "reset-names", id); >> + return __of_reset_control_get(node, index); > ... but not here? > >> +} >> EXPORT_SYMBOL_GPL(of_reset_control_get); >> >> /** >> diff --git a/include/linux/reset.h b/include/linux/reset.h >> index da5602bd77d7..f29fc88c4868 100644 >> --- a/include/linux/reset.h >> +++ b/include/linux/reset.h >> @@ -38,6 +38,9 @@ static inline struct reset_control *devm_reset_control_get_optional( >> struct reset_control *of_reset_control_get(struct device_node *node, >> const char *id); >> >> +struct reset_control *of_reset_control_get_by_index( >> + struct device_node *node, int index); >> + >> #else >> >> static inline int reset_control_reset(struct reset_control *rstc) >> @@ -92,6 +95,12 @@ static inline struct reset_control *of_reset_control_get( >> return ERR_PTR(-ENOSYS); >> } >> >> +struct reset_control *of_reset_control_get_by_index( >> + struct device_node *node, int index) > Seems like the node argument would fit on the previous line. Indeed. Thanks, Vince -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 7955e00d04d4..25a0da1654f8 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -140,28 +140,15 @@ int reset_control_status(struct reset_control *rstc) } EXPORT_SYMBOL_GPL(reset_control_status); -/** - * of_reset_control_get - Lookup and obtain a reference to a reset controller. - * @node: device to be reset by the controller - * @id: reset line name - * - * Returns a struct reset_control or IS_ERR() condition containing errno. - * - * Use of id names is optional. - */ -struct reset_control *of_reset_control_get(struct device_node *node, - const char *id) +struct reset_control *__of_reset_control_get(struct device_node *node, + int index) { struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER); struct reset_controller_dev *r, *rcdev; struct of_phandle_args args; - int index = 0; int rstc_id; int ret; - if (id) - index = of_property_match_string(node, - "reset-names", id); ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", index, &args); if (ret) @@ -202,6 +189,36 @@ struct reset_control *of_reset_control_get(struct device_node *node, return rstc; } + +struct reset_control *of_reset_control_get_by_index(struct device_node *node, + int index) +{ + if (!node) + return ERR_PTR(-EINVAL); + + return __of_reset_control_get(node, index); +} +EXPORT_SYMBOL_GPL(of_reset_control_get_by_index); + +/** + * of_reset_control_get - Lookup and obtain a reference to a reset controller. + * @node: device to be reset by the controller + * @id: reset line name + * + * Returns a struct reset_control or IS_ERR() condition containing errno. + * + * Use of id names is optional. + */ +struct reset_control *of_reset_control_get(struct device_node *node, + const char *id) +{ + int index = 0; + + if (id) + index = of_property_match_string(node, + "reset-names", id); + return __of_reset_control_get(node, index); +} EXPORT_SYMBOL_GPL(of_reset_control_get); /** diff --git a/include/linux/reset.h b/include/linux/reset.h index da5602bd77d7..f29fc88c4868 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -38,6 +38,9 @@ static inline struct reset_control *devm_reset_control_get_optional( struct reset_control *of_reset_control_get(struct device_node *node, const char *id); +struct reset_control *of_reset_control_get_by_index( + struct device_node *node, int index); + #else static inline int reset_control_reset(struct reset_control *rstc) @@ -92,6 +95,12 @@ static inline struct reset_control *of_reset_control_get( return ERR_PTR(-ENOSYS); } +struct reset_control *of_reset_control_get_by_index( + struct device_node *node, int index) +{ + return ERR_PTR(-ENOSYS); +} + #endif /* CONFIG_RESET_CONTROLLER */ #endif
Add of_reset_control_get_by_index() to allow the dirvers to get reset device without knowing its name. Signed-off-by: Vince Hsu <vinceh@nvidia.com> --- drivers/reset/core.c | 47 ++++++++++++++++++++++++++++++++--------------- include/linux/reset.h | 9 +++++++++ 2 files changed, 41 insertions(+), 15 deletions(-)