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 327d2e5..8fa4772 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 2892b71..7c1fba3 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 b88c401..1567c3a 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 40e4802..16fc64c 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 b02826e..f110bb5 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 f7aff81..d0a0313 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 aa294b1..b521539 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 ebad55c..28abb8f 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 93ad42b..db3998e 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 ecb96c2..4fcf9d1 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 aa3809d..30777f9 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 bad02ae..fa55e27 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 cf2a7c9..9d790bc 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;
 }