[2/2] phy: core: Remove API devm_phy_destroy()

Commit Message

Zijun Hu Feb. 10, 2025, 1:32 p.m. UTC

From: Zijun Hu <[e-mail]>

API devm_phy_destroy() has not had callers since 2013-09-27
when it was introduced.

Remove the API.

Signed-off-by: Zijun Hu <[e-mail]>
---
 Documentation/driver-api/phy/phy.rst                    |  6 ++----
 Documentation/translations/zh_CN/driver-api/phy/phy.rst |  7 ++-----
 drivers/phy/phy-core.c                                  | 17 -----------------
 include/linux/phy/phy.h                                 |  5 -----
 4 files changed, 4 insertions(+), 31 deletions(-)

Patch

diff --git a/Documentation/driver-api/phy/phy.rst b/Documentation/driver-api/phy/phy.rst
index be3687a2a11bbf84e6e5561b11931ea6db984434..cae03d8a4812b3c4cfca64272cc6b8f83a81d1c8 100644
--- a/Documentation/driver-api/phy/phy.rst
+++ b/Documentation/driver-api/phy/phy.rst
@@ -173,13 +173,11 @@  Destroying the PHY
 ==================
 
 When the driver that created the PHY is unloaded, it should destroy the PHY it
-created using one of the following 2 APIs::
+created using the following API::
 
 	void phy_destroy(struct phy *phy);
-	void devm_phy_destroy(struct device *dev, struct phy *phy);
 
-Both these APIs destroy the PHY and devm_phy_destroy destroys the devres
-associated with this PHY.
+The API destroys the PHY.
 
 PM Runtime
 ==========
diff --git a/Documentation/translations/zh_CN/driver-api/phy/phy.rst b/Documentation/translations/zh_CN/driver-api/phy/phy.rst
index 2d3f98deb92035c44fcb1ff0e3dc8543053140f6..37c23fcebf11f397d0dc502bbba11a74c525f085 100644
--- a/Documentation/translations/zh_CN/driver-api/phy/phy.rst
+++ b/Documentation/translations/zh_CN/driver-api/phy/phy.rst
@@ -164,14 +164,11 @@  PHY 关联的设备资源。
 销毁 PHY
 ========
 
-当创建 PHY 的驱动程序被卸载时，它应该使用以下 2 个 API 之一销毁其创
-建的 PHY::
+当创建 PHY 的驱动程序被卸载时，它应该使用以下 API 销毁其创建的 PHY::
 
 	void phy_destroy(struct phy *phy);
-	void devm_phy_destroy(struct device *dev, struct phy *phy);
 
-这两个 API 都会销毁 PHY，并且 devm_phy_destroy 会销毁与此 PHY 关
-联的 devres。
+这个 API 会销毁 PHY。
 
 PM Runtime
 ==========
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index dd6302dfd14d2ec060857fc019268096c33e37a2..8e0e11553e369e06f5ee4cdbb111b4ddb1b34e74 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -1107,23 +1107,6 @@  void phy_destroy(struct phy *phy)
 }
 EXPORT_SYMBOL_GPL(phy_destroy);
 
-/**
- * devm_phy_destroy() - destroy the PHY
- * @dev: device that wants to release this phy
- * @phy: the phy returned by devm_phy_get()
- *
- * destroys the devres associated with this phy and invokes phy_destroy
- * to destroy the phy.
- */
-void devm_phy_destroy(struct device *dev, struct phy *phy)
-{
-	int r;
-
-	r = devres_release(dev, devm_phy_consume, devm_phy_match, phy);
-	dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n");
-}
-EXPORT_SYMBOL_GPL(devm_phy_destroy);
-
 /**
  * __of_phy_provider_register() - create/register phy provider with the framework
  * @dev: struct device of the phy provider
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index 06037a7eefc4b0319008065d142c9f1caba2c74d..66eb664249ddaa6635bf80d8db115cb21473ceb8 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -278,7 +278,6 @@  struct phy *phy_create(struct device *dev, struct device_node *node,
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
 			    const struct phy_ops *ops);
 void phy_destroy(struct phy *phy);
-void devm_phy_destroy(struct device *dev, struct phy *phy);
 struct phy_provider *__of_phy_provider_register(struct device *dev,
 	struct device_node *children, struct module *owner,
 	struct phy * (*of_xlate)(struct device *dev,
@@ -521,10 +520,6 @@  static inline void phy_destroy(struct phy *phy)
 {
 }
 
-static inline void devm_phy_destroy(struct device *dev, struct phy *phy)
-{
-}
-
 static inline struct phy_provider *__of_phy_provider_register(
 	struct device *dev, struct device_node *children, struct module *owner,
 	struct phy * (*of_xlate)(struct device *dev,