Skip to contentSkip to conversation

drivers: reset: Mark function as static in core.c

PATCH Superseded Rashika Kheria 4 participants 4 messages Dec 14, 2013 Reset controller framework

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: reset: Mark function as static in core.c

This patch marks the function of_reset_simple_xlate() and devm_reset_control_put() as static in core.c because it is not used outside this file.

Thus, it also eliminate the following warnings in core.c:
drivers/reset/core.c:46:5: warning: no previous prototype for ‘of_reset_simple_xlate’ [-Wmissing-prototypes] drivers/reset/core.c:262:6: warning: no previous prototype for ‘devm_reset_control_put’ [-Wmissing-prototypes]

---
 drivers/reset/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/reset/core.c +2 -2
index d1b6089..8604053 100644
@@ -43,7 +43,7 @@ struct reset_control {
  * This simple translation function should be used for reset controllers
  * with 1:1 mapping, where reset lines can be indexed by number without gaps.
  */
-int of_reset_simple_xlate(struct reset_controller_dev *rcdev,
+static int of_reset_simple_xlate(struct reset_controller_dev *rcdev,
 			  const struct of_phandle_args *reset_spec)
 {
 	if (WARN_ON(reset_spec->args_count != rcdev->of_reset_n_cells))
@@ -259,7 +259,7 @@ static int devm_reset_control_match(struct device *dev, void *res, void *data)
  * This function will not need to be called normally, as devres will take
  * care of freeing the resource.
  */
-void devm_reset_control_put(struct reset_control *rstc)
+static void devm_reset_control_put(struct reset_control *rstc)
 {
 	int ret;
 
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 8 lines · Rashika Kheria

This patch marks the function of_reset_simple_xlate() and devm_reset_control_put() as static in core.c because it is not used outside this file.

Thus, it also eliminate the following warnings in core.c:
drivers/reset/core.c:46:5: warning: no previous prototype for ‘of_reset_simple_xlate’ [-Wmissing-prototypes] drivers/reset/core.c:262:6: warning: no previous prototype for ‘devm_reset_control_put’ [-Wmissing-prototypes]

These are EXPORT_SYMBOL_GPL() so that doesn't make sense. devm_reset_control_put() is not used at all and of_reset_simple_xlate() doesn't look like it needs to be exported. Philipp?

regards,
dan carpenter

#2 lore raw
Quoted 5 lines · Dan Carpenter
Quoted 4 lines · Rashika Kheria

This patch marks the function of_reset_simple_xlate() and devm_reset_control_put() as static in core.c because it is not used outside this file.

Quoted 8 lines
Quoted 4 lines

Thus, it also eliminate the following warnings in core.c:
drivers/reset/core.c:46:5: warning: no previous prototype for ‘of_reset_simple_xlate’ [-Wmissing-prototypes] drivers/reset/core.c:262:6: warning: no previous prototype for ‘devm_reset_control_put’ [-Wmissing-prototypes]

These are EXPORT_SYMBOL_GPL() so that doesn't make sense. devm_reset_control_put() is not used at all and of_reset_simple_xlate() doesn't look like it needs to be exported. Philipp?

That sounds like the right fix to me: drop devm_reset_control_put and its export completely, and drop the export of make of_reset_simple_xlate. Unless there's some relevant out-of-tree caller of either function, that seems sensible.

- Josh Triplett

#3 lore raw
Quoted 11 lines · Josh Triplett
Quoted 10 lines · Dan Carpenter
Quoted 8 lines · Rashika Kheria

This patch marks the function of_reset_simple_xlate() and devm_reset_control_put() as static in core.c because it is not used outside this file.

Thus, it also eliminate the following warnings in core.c:
drivers/reset/core.c:46:5: warning: no previous prototype for ‘of_reset_simple_xlate’ [-Wmissing-prototypes] drivers/reset/core.c:262:6: warning: no previous prototype for ‘devm_reset_control_put’ [-Wmissing-prototypes]

Quoted 8 lines
Quoted 3 lines

These are EXPORT_SYMBOL_GPL() so that doesn't make sense. devm_reset_control_put() is not used at all and of_reset_simple_xlate() doesn't look like it needs to be exported. Philipp?

That sounds like the right fix to me: drop devm_reset_control_put and its export completely, and drop the export of make of_reset_simple_xlate. Unless there's some relevant out-of-tree caller of either function, that seems sensible.

Yes, of_reset_simple_xlate() is used as default if the driver does not specify the .of_xlate field of the rcdev parameter to reset_controller_register(). It does not need to be exported. This is analogous to of_gpio_simple_xlate.

devm_reset_control_put would be needed if a driver wanted to release the reset control before the devres cleanup for some reason. I added it for symmetry with devm_reset_control_get but forgot the header prototypes.
If this is considered not useful, we should probably also review devm_{clk,gpiod,phy,pinctrl,pwm,regulator,usb}_put.

regards
Philipp