From: Zijun Hu <quic_zijuhu@xxxxxxxxxxx>
API devm_of_phy_provider_unregister() has not had callers
since 2013-09-27 when it was introduced.
Remove the API.
Signed-off-by: Zijun Hu <quic_zijuhu@xxxxxxxxxxx>
---
Documentation/driver-api/phy/phy.rst | 5 +----
.../translations/zh_CN/driver-api/phy/phy.rst | 5 +----
drivers/phy/phy-core.c | 19 -------------------
include/linux/phy/phy.h | 6 ------
4 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/Documentation/driver-api/phy/phy.rst b/Documentation/driver-api/phy/phy.rst
index 81785c084f3ec2dd02af2131fbc8632cb5b33b0b..be3687a2a11bbf84e6e5561b11931ea6db984434 100644
--- a/Documentation/driver-api/phy/phy.rst
+++ b/Documentation/driver-api/phy/phy.rst
@@ -64,12 +64,9 @@ macros can be used to override the node containing the children.
__devm_of_phy_provider_register_full(dev, children,
THIS_MODULE, xlate)
- void devm_of_phy_provider_unregister(struct device *dev,
- struct phy_provider *phy_provider);
void of_phy_provider_unregister(struct phy_provider *phy_provider);
-devm_of_phy_provider_unregister and of_phy_provider_unregister can be used to
-unregister the PHY.
+of_phy_provider_unregister can be used to unregister the PHY.
Creating the PHY
================
diff --git a/Documentation/translations/zh_CN/driver-api/phy/phy.rst b/Documentation/translations/zh_CN/driver-api/phy/phy.rst
index 0d7489081b904d6fc5aa21824c969e325e801297..2d3f98deb92035c44fcb1ff0e3dc8543053140f6 100644
--- a/Documentation/translations/zh_CN/driver-api/phy/phy.rst
+++ b/Documentation/translations/zh_CN/driver-api/phy/phy.rst
@@ -63,12 +63,9 @@ devm_of_phy_provider_register_full() 宏来覆盖包含子节点的节点。
__devm_of_phy_provider_register_full(dev, children,
THIS_MODULE, xlate)
- void devm_of_phy_provider_unregister(struct device *dev,
- struct phy_provider *phy_provider);
void of_phy_provider_unregister(struct phy_provider *phy_provider);
-devm_of_phy_provider_unregister 和 of_phy_provider_unregister
-可以被用来注销PHY.
+of_phy_provider_unregister() 可以被用来注销PHY.
创建PHY
=======
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 8dfdce605a905d7f38205727151258af41f807a9..dd6302dfd14d2ec060857fc019268096c33e37a2 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -1248,25 +1248,6 @@ void of_phy_provider_unregister(struct phy_provider *phy_provider)
}
EXPORT_SYMBOL_GPL(of_phy_provider_unregister);
-/**
- * devm_of_phy_provider_unregister() - remove phy provider from the framework
- * @dev: struct device of the phy provider
- * @phy_provider: phy provider returned by of_phy_provider_register()
- *
- * destroys the devres associated with this phy provider and invokes
- * of_phy_provider_unregister to unregister the phy provider.
- */
-void devm_of_phy_provider_unregister(struct device *dev,
- struct phy_provider *phy_provider)
-{
- int r;
-
- r = devres_release(dev, devm_phy_provider_release, devm_phy_match,
- phy_provider);
- dev_WARN_ONCE(dev, r, "couldn't find PHY provider device resource\n");
-}
-EXPORT_SYMBOL_GPL(devm_of_phy_provider_unregister);
-
/**
* phy_release() - release the phy
* @dev: the dev member within phy
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index 03cd5bae92d3f189d739c453fe4c160dd2a5063e..06037a7eefc4b0319008065d142c9f1caba2c74d 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -288,8 +288,6 @@ struct phy_provider *__devm_of_phy_provider_register(struct device *dev,
struct phy * (*of_xlate)(struct device *dev,
const struct of_phandle_args *args));
void of_phy_provider_unregister(struct phy_provider *phy_provider);
-void devm_of_phy_provider_unregister(struct device *dev,
- struct phy_provider *phy_provider);
int phy_create_lookup(struct phy *phy, const char *con_id, const char *dev_id);
void phy_remove_lookup(struct phy *phy, const char *con_id, const char *dev_id);
#else
@@ -547,10 +545,6 @@ static inline void of_phy_provider_unregister(struct phy_provider *phy_provider)
{
}
-static inline void devm_of_phy_provider_unregister(struct device *dev,
- struct phy_provider *phy_provider)
-{
-}
static inline int
phy_create_lookup(struct phy *phy, const char *con_id, const char *dev_id)
{
--
2.34.1
