Revert "display error on module window"
This reverts commit 96f6e050107da5d258280b785e5ed410d534a775.
Conflicts:
gpio.c
regulator.c
sensor.c
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
diff --git a/regulator.c b/regulator.c
index 549a744..1f7aefd 100644
--- a/regulator.c
+++ b/regulator.c
@@ -73,7 +73,6 @@
};
static struct tree *reg_tree;
-static bool regulator_error = false;
static struct regulator_info *regulator_alloc(void)
{
@@ -226,12 +225,6 @@
static int regulator_display(bool refresh)
{
- if (regulator_error) {
- display_message(REGULATOR,
- "error: path " SYSFS_REGULATOR " not found");
- return -2;
- }
-
if (refresh && read_regulator_info(reg_tree))
return -1;
@@ -267,18 +260,9 @@
int regulator_init(struct powerdebug_options *options)
{
- int ret = 0;
-
if (!(options->flags & REGULATOR_OPTION))
return 0;
- ret = display_register(REGULATOR, ®ulator_ops);
- if (ret)
- printf("error: regulator display register failed");
-
- if (access(SYSFS_REGULATOR, F_OK))
- regulator_error = true; /* set the flag */
-
reg_tree = tree_load(SYSFS_REGULATOR, regulator_filter_cb, false);
if (!reg_tree)
return -1;
@@ -286,5 +270,5 @@
if (fill_regulator_tree())
return -1;
- return ret;
+ return display_register(REGULATOR, ®ulator_ops);
}