The purpose of this patch is to guarantee that ab8500-debug will
record the regulator registers before they are modified by the
ab8500 regulator driver.

Signed-off-by: Bengt Jonsson <bengt.g.jons...@stericsson.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Reviewed-by: Jonas ABERG <jonas.ab...@stericsson.com>
---
 drivers/regulator/ab8500.c       |   10 ++++++++++
 include/linux/regulator/ab8500.h |   14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 0e3dd64..406c561 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -998,6 +998,11 @@ static int ab8500_regulator_probe(struct platform_device 
*pdev)
                return -EINVAL;
        }
 
+       /* initialize debug (initial state is recorded with this call) */
+       err = ab8500_regulator_debug_init(pdev);
+       if (err)
+               return err;
+
        /* initialize registers */
        for (i = 0; i < pdata->num_reg_init; i++) {
                int id, mask, value;
@@ -1048,6 +1053,11 @@ static int ab8500_regulator_remove(struct 
platform_device *pdev)
        if (err)
                return err;
 
+       /* remove regulator debug */
+       err = ab8500_regulator_debug_exit(pdev);
+       if (err)
+               return err;
+
        return 0;
 }
 
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 9a2da6a..094d24c 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -190,4 +190,18 @@ inline int ab8500_ext_regulator_exit(struct 
platform_device *pdev)
 }
 #endif
 
+#ifdef CONFIG_REGULATOR_AB8500_DEBUG
+int ab8500_regulator_debug_init(struct platform_device *pdev);
+int ab8500_regulator_debug_exit(struct platform_device *pdev);
+#else
+static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
+{
+       return 0;
+}
+static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
+{
+       return 0;
+}
+#endif
+
 #endif
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to