From e129677910ddcd120d06aa58ac56e173d09eaa7f Mon Sep 17 00:00:00 2001 From: Vyacheslav Cherkashin Date: Thu, 17 Oct 2013 22:23:26 +0400 Subject: [PATCH] [REFACTOR] energy: move read_val() move: energy/lcd/s6e8aa0.c --> energy/lcd/lcd_base.c Change-Id: I8ff66df899d429cbfaeba2b10dbc2c60ce8c11bf Signed-off-by: Vyacheslav Cherkashin --- energy/lcd/lcd_base.c | 26 ++++++++++++++++++++++++++ energy/lcd/lcd_base.h | 1 + energy/lcd/s6e8aa0.c | 26 -------------------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/energy/lcd/lcd_base.c b/energy/lcd/lcd_base.c index 88f2e37..1e5d1b1 100644 --- a/energy/lcd/lcd_base.c +++ b/energy/lcd/lcd_base.c @@ -24,9 +24,35 @@ #include +#include #include "lcd_base.h" +int read_val(const char *path) +{ + int ret; + struct file *f; + unsigned long val; + char buf[32]; + + f = filp_open(path, O_RDONLY, 0); + if (IS_ERR(f)) { + printk("cannot open file \'%s\'", path); + return PTR_ERR(f); + } + + ret = kernel_read(f, 0, buf, sizeof(buf)); + filp_close(f, NULL); + if (ret < 0) + return ret; + + ret = strict_strtoul(buf, 0, &val); + if (ret) + return ret; + + return (int)val; +} + void set_backlight(int val) { /* TODO: implement */ diff --git a/energy/lcd/lcd_base.h b/energy/lcd/lcd_base.h index 8b59c56..4f4ec56 100644 --- a/energy/lcd/lcd_base.h +++ b/energy/lcd/lcd_base.h @@ -52,6 +52,7 @@ void lcd_mach_exit(void) } #endif /* CONFIG_ENEGRGY_LCD */ +int read_val(const char *path); int lcd_init(void); void lcd_exit(void); diff --git a/energy/lcd/s6e8aa0.c b/energy/lcd/s6e8aa0.c index 4e666c5..432b74a 100644 --- a/energy/lcd/s6e8aa0.c +++ b/energy/lcd/s6e8aa0.c @@ -4,32 +4,6 @@ static struct lcd_ops_set *ops_s = NULL; -static int read_val(const char *path) -{ - int ret; - struct file *f; - unsigned long val; - char buf[32]; - - f = filp_open(path, O_RDONLY, 0); - if (IS_ERR(f)) { - printk("cannot open file \'%s\'", path); - return PTR_ERR(f); - } - - ret = kernel_read(f, 0, buf, sizeof(buf)); - filp_close(f, NULL); - if (ret < 0) - return ret; - - ret = strict_strtoul(buf, 0, &val); - if (ret) - return ret; - - return (int)val; -} - - -- 2.7.4