Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next

[karo-tx-linux.git] / drivers / clk / clk-max77686.c

diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
index d098f72e1d5ffea90c4b406dd67db2a775ecb4e5..9f57bc37cd60a3e7559c3972e2eb0ac55145b2b9 100644 (file)
--- a/drivers/clk/clk-max77686.c
+++ b/drivers/clk/clk-max77686.c
@@ -44,33 +44,23 @@ struct max77686_clk {
        struct clk_lookup *lookup;
 };
 
-static struct max77686_clk *get_max77686_clk(struct clk_hw *hw)
+static struct max77686_clk *to_max77686_clk(struct clk_hw *hw)
 {
        return container_of(hw, struct max77686_clk, hw);
 }
 
 static int max77686_clk_prepare(struct clk_hw *hw)
 {
-       struct max77686_clk *max77686;
-       int ret;
-
-       max77686 = get_max77686_clk(hw);
-       if (!max77686)
-               return -ENOMEM;
-
-       ret = regmap_update_bits(max77686->iodev->regmap,
-               MAX77686_REG_32KHZ, max77686->mask, max77686->mask);
+       struct max77686_clk *max77686 = to_max77686_clk(hw);
 
-       return ret;
+       return regmap_update_bits(max77686->iodev->regmap,
+                                 MAX77686_REG_32KHZ, max77686->mask,
+                                 max77686->mask);
 }
 
 static void max77686_clk_unprepare(struct clk_hw *hw)
 {
-       struct max77686_clk *max77686;
-
-       max77686 = get_max77686_clk(hw);
-       if (!max77686)
-               return;
+       struct max77686_clk *max77686 = to_max77686_clk(hw);
 
        regmap_update_bits(max77686->iodev->regmap,
                MAX77686_REG_32KHZ, max77686->mask, ~max77686->mask);
@@ -78,14 +68,10 @@ static void max77686_clk_unprepare(struct clk_hw *hw)
 
 static int max77686_clk_is_enabled(struct clk_hw *hw)
 {
-       struct max77686_clk *max77686;
+       struct max77686_clk *max77686 = to_max77686_clk(hw);
        int ret;
        u32 val;
 
-       max77686 = get_max77686_clk(hw);
-       if (!max77686)
-               return -ENOMEM;
-
        ret = regmap_read(max77686->iodev->regmap,
                                MAX77686_REG_32KHZ, &val);
 
@@ -130,9 +116,8 @@ static int max77686_clk_register(struct device *dev,
        if (IS_ERR(clk))
                return -ENOMEM;
 
-       max77686->lookup = devm_kzalloc(dev, sizeof(struct clk_lookup),
-                                       GFP_KERNEL);
-       if (IS_ERR(max77686->lookup))
+       max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL);
+       if (!max77686->lookup)
                return -ENOMEM;
 
        max77686->lookup->con_id = hw->init->name;
@@ -151,13 +136,13 @@ static int max77686_clk_probe(struct platform_device *pdev)
 
        max77686_clks = devm_kzalloc(&pdev->dev, sizeof(struct max77686_clk *)
                                        * MAX77686_CLKS_NUM, GFP_KERNEL);
-       if (IS_ERR(max77686_clks))
+       if (!max77686_clks)
                return -ENOMEM;
 
        for (i = 0; i < MAX77686_CLKS_NUM; i++) {
                max77686_clks[i] = devm_kzalloc(&pdev->dev,
                                        sizeof(struct max77686_clk), GFP_KERNEL);
-               if (IS_ERR(max77686_clks[i]))
+               if (!max77686_clks[i])
                        return -ENOMEM;
        }