phy: qcom-ufs-qmp-xx: Discard remove callback for drivers.

remove() callback does a phy_power_off() only over the phy,
and nothing else now.
The phy_power_off() over the generic phy is called from the phy
consumer, and phy provider driver should not explicitly need to
call any phy ops.
So discard the remove callback for qcom-ufs phy platform drivers.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/phy/phy-qcom-ufs-qmp-14nm.c b/drivers/phy/phy-qcom-ufs-qmp-14nm.c
index b3d2612a7ae89a72a0e178ed034c113938617ddb..560f272810f137563b93df5f79511f24e327fb6c 100644 (file)
--- a/drivers/phy/phy-qcom-ufs-qmp-14nm.c
+++ b/drivers/phy/phy-qcom-ufs-qmp-14nm.c
@@ -163,21 +163,6 @@ out:
        return err;
 }
 
-static int ufs_qcom_phy_qmp_14nm_remove(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct phy *generic_phy = to_phy(dev);
-       struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);
-       int err = 0;
-
-       err = ufs_qcom_phy_remove(generic_phy, ufs_qcom_phy);
-       if (err)
-               dev_err(dev, "%s: ufs_qcom_phy_remove failed = %d\n",
-                       __func__, err);
-
-       return err;
-}
-
 static const struct of_device_id ufs_qcom_phy_qmp_14nm_of_match[] = {
        {.compatible = "qcom,ufs-phy-qmp-14nm"},
        {.compatible = "qcom,msm8996-ufs-phy-qmp-14nm"},
@@ -187,7 +172,6 @@ MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_14nm_of_match);
 
 static struct platform_driver ufs_qcom_phy_qmp_14nm_driver = {
        .probe = ufs_qcom_phy_qmp_14nm_probe,
-       .remove = ufs_qcom_phy_qmp_14nm_remove,
        .driver = {
                .of_match_table = ufs_qcom_phy_qmp_14nm_of_match,
                .name = "ufs_qcom_phy_qmp_14nm",

diff --git a/drivers/phy/phy-qcom-ufs-qmp-20nm.c b/drivers/phy/phy-qcom-ufs-qmp-20nm.c
index e09ecb8c1e5f0709bb78af840de4fed6ab0fe5da..9a2f53d5aa1da4ba473fec392cff736d304eda7c 100644 (file)
--- a/drivers/phy/phy-qcom-ufs-qmp-20nm.c
+++ b/drivers/phy/phy-qcom-ufs-qmp-20nm.c
@@ -219,21 +219,6 @@ out:
        return err;
 }
 
-static int ufs_qcom_phy_qmp_20nm_remove(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct phy *generic_phy = to_phy(dev);
-       struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);
-       int err = 0;
-
-       err = ufs_qcom_phy_remove(generic_phy, ufs_qcom_phy);
-       if (err)
-               dev_err(dev, "%s: ufs_qcom_phy_remove failed = %d\n",
-                       __func__, err);
-
-       return err;
-}
-
 static const struct of_device_id ufs_qcom_phy_qmp_20nm_of_match[] = {
        {.compatible = "qcom,ufs-phy-qmp-20nm"},
        {},
@@ -242,7 +227,6 @@ MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_20nm_of_match);
 
 static struct platform_driver ufs_qcom_phy_qmp_20nm_driver = {
        .probe = ufs_qcom_phy_qmp_20nm_probe,
-       .remove = ufs_qcom_phy_qmp_20nm_remove,
        .driver = {
                .of_match_table = ufs_qcom_phy_qmp_20nm_of_match,
                .name = "ufs_qcom_phy_qmp_20nm",

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index 3fa7b07aaecae4b23979228f220542541ccf3de9..b85f88251aa2fb8fdee952148f60d87d0be6e7a4 100644 (file)
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -619,15 +619,6 @@ int ufs_qcom_phy_calibrate_phy(struct phy *generic_phy, bool is_rate_B)
 }
 EXPORT_SYMBOL_GPL(ufs_qcom_phy_calibrate_phy);
 
-int ufs_qcom_phy_remove(struct phy *generic_phy,
-                       struct ufs_qcom_phy *ufs_qcom_phy)
-{
-       phy_power_off(generic_phy);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(ufs_qcom_phy_remove);
-
 int ufs_qcom_phy_exit(struct phy *generic_phy)
 {
        struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);