These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / qcom / lcc-msm8960.c

diff --git a/kernel/drivers/clk/qcom/lcc-msm8960.c b/kernel/drivers/clk/qcom/lcc-msm8960.c
index d0df9d5..4fcf9d1 100644 (file)
--- a/kernel/drivers/clk/qcom/lcc-msm8960.c
+++ b/kernel/drivers/clk/qcom/lcc-msm8960.c
@@ -57,7 +57,7 @@ static const struct parent_map lcc_pxo_pll4_map[] = {
        { P_PLL4, 2 }
 };
 
-static const char *lcc_pxo_pll4[] = {
+static const char * const lcc_pxo_pll4[] = {
        "pxo",
        "pll4_vote",
 };
@@ -127,7 +127,7 @@ static struct clk_rcg mi2s_osr_src = {
        },
 };
 
-static const char *lcc_mi2s_parents[] = {
+static const char * const lcc_mi2s_parents[] = {
        "mi2s_osr_src",
 };
 
@@ -233,7 +233,7 @@ static struct clk_rcg prefix##_osr_src = {                  \
        },                                                      \
 };                                                             \
                                                                \
-static const char *lcc_##prefix##_parents[] = {                        \
+static const char * const lcc_##prefix##_parents[] = {         \
        #prefix "_osr_src",                                     \
 };                                                             \
                                                                \
@@ -445,7 +445,7 @@ static struct clk_rcg slimbus_src = {
        },
 };
 
-static const char *lcc_slimbus_parents[] = {
+static const char * const lcc_slimbus_parents[] = {
        "slimbus_src",
 };
 
@@ -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,