clk: qcom: Drop calls to qcom_cc_remove()

Now that qcom_cc_remove() is a nop, drop calls to
qcom_cc_remove() and any empty driver remove functions.

Cc: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index 327d2e5d9f1c4a7d91e35581809f5c588bbeef66..8fa477293ae0ad1f21ab711d991dbc0898a4d34f 100644 (file)
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -168,9 +168,4 @@ int qcom_cc_probe(struct platform_device *pdev, const struct qcom_cc_desc *desc)
 }
 EXPORT_SYMBOL_GPL(qcom_cc_probe);
 
-void qcom_cc_remove(struct platform_device *pdev)
-{
-}
-EXPORT_SYMBOL_GPL(qcom_cc_remove);
-
 MODULE_LICENSE("GPL v2");

diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h
index 2892b71fbd713966f9de128ccf3e9ae863a3ddfa..7c1fba3ebc038b5367b8dd8e659dc5c711b401ee 100644 (file)
--- a/drivers/clk/qcom/common.h
+++ b/drivers/clk/qcom/common.h
@@ -45,6 +45,4 @@ extern int qcom_cc_really_probe(struct platform_device *pdev,
 extern int qcom_cc_probe(struct platform_device *pdev,
                         const struct qcom_cc_desc *desc);
 
-extern void qcom_cc_remove(struct platform_device *pdev);
-
 #endif

diff --git a/drivers/clk/qcom/gcc-apq8084.c b/drivers/clk/qcom/gcc-apq8084.c
index b88c4011526363694eb2bf6988aeb41584909ac9..1567c3a7953474af552fd71d6f92773ec23bc898 100644 (file)
--- a/drivers/clk/qcom/gcc-apq8084.c
+++ b/drivers/clk/qcom/gcc-apq8084.c
@@ -3623,15 +3623,8 @@ static int gcc_apq8084_probe(struct platform_device *pdev)
        return qcom_cc_probe(pdev, &gcc_apq8084_desc);
 }
 
-static int gcc_apq8084_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_apq8084_driver = {
        .probe          = gcc_apq8084_probe,
-       .remove         = gcc_apq8084_remove,
        .driver         = {
                .name   = "gcc-apq8084",
                .of_match_table = gcc_apq8084_match_table,

diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
index 40e480220cd3fb60206a5d8f5bbbf5aba10c3ac9..16fc64c082a5e1e351e5c957cfe7d1a44b1c8d22 100644 (file)
--- a/drivers/clk/qcom/gcc-ipq806x.c
+++ b/drivers/clk/qcom/gcc-ipq806x.c
@@ -3058,15 +3058,8 @@ static int gcc_ipq806x_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int gcc_ipq806x_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_ipq806x_driver = {
        .probe          = gcc_ipq806x_probe,
-       .remove         = gcc_ipq806x_remove,
        .driver         = {
                .name   = "gcc-ipq806x",
                .of_match_table = gcc_ipq806x_match_table,

diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c
index b02826ed770a25f474e37922133c7e0ead56c8d0..f110bb5a1df3ea868c19f491c33ee2c86bab9fb0 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8660.c
+++ b/drivers/clk/qcom/gcc-msm8660.c
@@ -2735,15 +2735,8 @@ static int gcc_msm8660_probe(struct platform_device *pdev)
        return qcom_cc_probe(pdev, &gcc_msm8660_desc);
 }
 
-static int gcc_msm8660_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_msm8660_driver = {
        .probe          = gcc_msm8660_probe,
-       .remove         = gcc_msm8660_remove,
        .driver         = {
                .name   = "gcc-msm8660",
                .of_match_table = gcc_msm8660_match_table,

diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c
index f7aff814368ad4be8bf2c03dc6cc4028779d06b9..d0a0313d6bef601f229b70782b930ffa7838e1f8 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8916.c
+++ b/drivers/clk/qcom/gcc-msm8916.c
@@ -3372,15 +3372,8 @@ static int gcc_msm8916_probe(struct platform_device *pdev)
        return qcom_cc_probe(pdev, &gcc_msm8916_desc);
 }
 
-static int gcc_msm8916_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_msm8916_driver = {
        .probe          = gcc_msm8916_probe,
-       .remove         = gcc_msm8916_remove,
        .driver         = {
                .name   = "gcc-msm8916",
                .of_match_table = gcc_msm8916_match_table,

diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
index aa294b1bad343ccbef5b4daef38cda33fd6513f1..b5215390389325d620f042892c28acfcce50c205 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8960.c
+++ b/drivers/clk/qcom/gcc-msm8960.c
@@ -3525,7 +3525,6 @@ static int gcc_msm8960_probe(struct platform_device *pdev)
 
 static int gcc_msm8960_remove(struct platform_device *pdev)
 {
-       qcom_cc_remove(pdev);
        return 0;
 }
 

diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c
index ebad55c74917a40b7edf919660e6030f0ec6938a..28abb8f8f293d1c3ad373139796d4725bd040e77 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8974.c
+++ b/drivers/clk/qcom/gcc-msm8974.c
@@ -2744,15 +2744,8 @@ static int gcc_msm8974_probe(struct platform_device *pdev)
        return qcom_cc_probe(pdev, &gcc_msm8974_desc);
 }
 
-static int gcc_msm8974_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver gcc_msm8974_driver = {
        .probe          = gcc_msm8974_probe,
-       .remove         = gcc_msm8974_remove,
        .driver         = {
                .name   = "gcc-msm8974",
                .of_match_table = gcc_msm8974_match_table,

diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c
index 93ad42b1436604be66fcbb8081932879929fd823..db3998e5e2d83d77a5b07f8d1e29490b2e532f6d 100644 (file)
--- a/drivers/clk/qcom/lcc-ipq806x.c
+++ b/drivers/clk/qcom/lcc-ipq806x.c
@@ -452,15 +452,8 @@ static int lcc_ipq806x_probe(struct platform_device *pdev)
        return qcom_cc_really_probe(pdev, &lcc_ipq806x_desc, regmap);
 }
 
-static int lcc_ipq806x_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver lcc_ipq806x_driver = {
        .probe          = lcc_ipq806x_probe,
-       .remove         = lcc_ipq806x_remove,
        .driver         = {
                .name   = "lcc-ipq806x",
                .of_match_table = lcc_ipq806x_match_table,

diff --git a/drivers/clk/qcom/lcc-msm8960.c b/drivers/clk/qcom/lcc-msm8960.c
index ecb96c2846756e78185ad9b3be6b9d8d75218edc..4fcf9d1d233c0a0c64c2455efcdd11015da89b18 100644 (file)
--- a/drivers/clk/qcom/lcc-msm8960.c
+++ b/drivers/clk/qcom/lcc-msm8960.c
@@ -565,15 +565,8 @@ static int lcc_msm8960_probe(struct platform_device *pdev)
        return qcom_cc_really_probe(pdev, &lcc_msm8960_desc, regmap);
 }
 
-static int lcc_msm8960_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver lcc_msm8960_driver = {
        .probe          = lcc_msm8960_probe,
-       .remove         = lcc_msm8960_remove,
        .driver         = {
                .name   = "lcc-msm8960",
                .of_match_table = lcc_msm8960_match_table,

diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c
index aa3809d9cec59fe36540d5ff4d30afe652d9e2c6..30777f9f1a439eef1ad5e8d4446017d7f3999392 100644 (file)
--- a/drivers/clk/qcom/mmcc-apq8084.c
+++ b/drivers/clk/qcom/mmcc-apq8084.c
@@ -3402,15 +3402,8 @@ static int mmcc_apq8084_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int mmcc_apq8084_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver mmcc_apq8084_driver = {
        .probe          = mmcc_apq8084_probe,
-       .remove         = mmcc_apq8084_remove,
        .driver         = {
                .name   = "mmcc-apq8084",
                .of_match_table = mmcc_apq8084_match_table,

diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c
index bad02aebf959b6caed9b1941d8b9decf4152f7dd..fa55e27dd9059dcf09645b43f738ac8bec93ef85 100644 (file)
--- a/drivers/clk/qcom/mmcc-msm8960.c
+++ b/drivers/clk/qcom/mmcc-msm8960.c
@@ -2686,15 +2686,8 @@ static int mmcc_msm8960_probe(struct platform_device *pdev)
        return qcom_cc_really_probe(pdev, match->data, regmap);
 }
 
-static int mmcc_msm8960_remove(struct platform_device *pdev)
-{
-       qcom_cc_remove(pdev);
-       return 0;
-}
-
 static struct platform_driver mmcc_msm8960_driver = {
        .probe          = mmcc_msm8960_probe,
-       .remove         = mmcc_msm8960_remove,
        .driver         = {
                .name   = "mmcc-msm8960",
                .of_match_table = mmcc_msm8960_match_table,

diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c
index cf2a7c9c95e6625be94a2dde6b269b71f086a615..9d790bcadf25a75a360f8d5aebfdf4ab50237c61 100644 (file)
--- a/drivers/clk/qcom/mmcc-msm8974.c
+++ b/drivers/clk/qcom/mmcc-msm8974.c
@@ -2628,16 +2628,12 @@ static int mmcc_msm8974_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = pm_genpd_add_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd);
-       if (ret)
-               qcom_cc_remove(pdev);
-       return ret;
+       return pm_genpd_add_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd);
 }
 
 static int mmcc_msm8974_remove(struct platform_device *pdev)
 {
        pm_genpd_remove_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd);
-       qcom_cc_remove(pdev);
        return 0;
 }