mfd: Add tps65910 32-kHz-crystal-input init

Replace tps65910_misc_init with a dedicated init function for the
32-kHz-crystal input, and make the code more readable.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 3f27ea1f1ba6b72e1893382585a148bd1d21f637..1c563792c777ba8f04c194a2a99c39159d8871f7 100644 (file)
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -68,20 +68,19 @@ static const struct regmap_config tps65910_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit tps65910_misc_init(struct tps65910 *tps65910,
+static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910,
                                        struct tps65910_board *pmic_pdata)
 {
-       struct device *dev = tps65910->dev;
        int ret;
 
-       if (pmic_pdata->en_ck32k_xtal) {
-               ret = tps65910_reg_clear_bits(tps65910,
-                                               TPS65910_DEVCTRL,
+       if (!pmic_pdata->en_ck32k_xtal)
+               return 0;
+
+       ret = tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
                                                DEVCTRL_CK32K_CTRL_MASK);
-               if (ret < 0) {
-                       dev_err(dev, "clear ck32k_ctrl failed: %d\n", ret);
-                       return ret;
-               }
+       if (ret < 0) {
+               dev_err(tps65910->dev, "clear ck32k_ctrl failed: %d\n", ret);
+               return ret;
        }
 
        return 0;
@@ -265,7 +264,7 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
        init_data->irq_base = pmic_plat_data->irq_base;
 
        tps65910_irq_init(tps65910, init_data->irq, init_data);
-       tps65910_misc_init(tps65910, pmic_plat_data);
+       tps65910_ck32k_init(tps65910, pmic_plat_data);
        tps65910_sleepinit(tps65910, pmic_plat_data);
 
        return ret;