[PATCH 102/102] reset: finish transition to explicit exclusive reset control requests

[Philipp Zabel]

Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. After all drivers are converted to the explicit API
calls, the temporary transition helpers can be removed.

Cc: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
---
 drivers/reset/core.c  |  2 +-
 include/linux/reset.h | 50 --------------------------------------------------
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 0090784ff4105..9ebeb148d4516 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -461,7 +461,7 @@ int device_reset(struct device *dev)
 	struct reset_control *rstc;
 	int ret;
 
-	rstc = reset_control_get(dev, NULL);
+	rstc = reset_control_get_exclusive(dev, NULL);
 	if (IS_ERR(rstc))
 		return PTR_ERR(rstc);
 
diff --git a/include/linux/reset.h b/include/linux/reset.h
index 13d8681210d54..77a65dea9e82b 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -324,54 +324,4 @@ devm_reset_control_get_shared_by_index(struct device *dev, int index)
 	return __devm_reset_control_get(dev, NULL, index, true, false);
 }
 
-/*
- * TEMPORARY calls to use during transition:
- *
- *   of_reset_control_get() => of_reset_control_get_exclusive()
- *
- * These inline function calls will be removed once all consumers
- * have been moved over to the new explicit API.
- */
-static inline struct reset_control *reset_control_get(
-				struct device *dev, const char *id)
-{
-	return reset_control_get_exclusive(dev, id);
-}
-
-static inline struct reset_control *reset_control_get_optional(
-					struct device *dev, const char *id)
-{
-	return reset_control_get_optional_exclusive(dev, id);
-}
-
-static inline struct reset_control *of_reset_control_get(
-				struct device_node *node, const char *id)
-{
-	return of_reset_control_get_exclusive(node, id);
-}
-
-static inline struct reset_control *of_reset_control_get_by_index(
-				struct device_node *node, int index)
-{
-	return of_reset_control_get_exclusive_by_index(node, index);
-}
-
-static inline struct reset_control *devm_reset_control_get(
-				struct device *dev, const char *id)
-{
-	return devm_reset_control_get_exclusive(dev, id);
-}
-
-static inline struct reset_control *devm_reset_control_get_optional(
-				struct device *dev, const char *id)
-{
-	return devm_reset_control_get_optional_exclusive(dev, id);
-
-}
-
-static inline struct reset_control *devm_reset_control_get_by_index(
-				struct device *dev, int index)
-{
-	return devm_reset_control_get_exclusive_by_index(dev, index);
-}
 #endif
-- 
2.11.0