Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[deliverable/linux.git] / drivers / clk / clk-palmas.c

diff --git a/drivers/clk/clk-palmas.c b/drivers/clk/clk-palmas.c
index 8e3039f0c3f9544de39bc8c06be41a2337b8492a..9c0b8e6b1ab322b13aaef11ddb451c1b84ecffc9 100644 (file)
--- a/drivers/clk/clk-palmas.c
+++ b/drivers/clk/clk-palmas.c
@@ -44,7 +44,7 @@ struct palmas_clock_info {
        struct clk *clk;
        struct clk_hw hw;
        struct palmas *palmas;
-       struct palmas_clk32k_desc *clk_desc;
+       const struct palmas_clk32k_desc *clk_desc;
        int ext_control_pin;
 };
 
@@ -125,10 +125,10 @@ static struct clk_ops palmas_clks_ops = {
 
 struct palmas_clks_of_match_data {
        struct clk_init_data init;
-       struct palmas_clk32k_desc desc;
+       const struct palmas_clk32k_desc desc;
 };
 
-static struct palmas_clks_of_match_data palmas_of_clk32kg = {
+static const struct palmas_clks_of_match_data palmas_of_clk32kg = {
        .init = {
                .name = "clk32kg",
                .ops = &palmas_clks_ops,
@@ -144,7 +144,7 @@ static struct palmas_clks_of_match_data palmas_of_clk32kg = {
        },
 };
 
-static struct palmas_clks_of_match_data palmas_of_clk32kgaudio = {
+static const struct palmas_clks_of_match_data palmas_of_clk32kgaudio = {
        .init = {
                .name = "clk32kgaudio",
                .ops = &palmas_clks_ops,
@@ -240,14 +240,14 @@ static int palmas_clks_probe(struct platform_device *pdev)
 {
        struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
        struct device_node *node = pdev->dev.of_node;
-       struct palmas_clks_of_match_data *match_data;
-       const struct of_device_id *match;
+       const struct palmas_clks_of_match_data *match_data;
        struct palmas_clock_info *cinfo;
        struct clk *clk;
        int ret;
 
-       match = of_match_device(palmas_clks_of_match, &pdev->dev);
-       match_data = (struct palmas_clks_of_match_data *)match->data;
+       match_data = of_device_get_match_data(&pdev->dev);
+       if (!match_data)
+               return 1;
 
        cinfo = devm_kzalloc(&pdev->dev, sizeof(*cinfo), GFP_KERNEL);
        if (!cinfo)