From 84ea977bab5b7a6944069c93a8516edac341ff75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Fri, 24 Oct 2014 15:35:01 +0800 Subject: [PATCH] rk:pmic:rk808&rk818:modify some warning --- drivers/mfd/rk808.c | 65 ++++++++++++++++++--------------------------- drivers/mfd/rk818.c | 65 ++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 78 deletions(-) diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index 02446ee4bcfe..eaf83c93cee5 100755 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -969,7 +969,7 @@ static ssize_t rk808_test_store(struct kobject *kobj, struct kobj_attribute *att const char *buf, size_t n) { u32 getdata[8]; - u16 regAddr; + u8 regAddr; u8 data; char cmd; const char *buftmp = buf; @@ -980,45 +980,32 @@ static ssize_t rk808_test_store(struct kobject *kobj, struct kobj_attribute *att * R regAddr(8Bit) * C gpio_name(poweron/powerhold/sleep/boot0/boot1) value(H/L) */ - regAddr = (u16)(getdata[0] & 0xff); - if (strncmp(buf, "start", 5) == 0) { - - - } else if (strncmp(buf, "stop", 4== 0) ){ - - } else{ - sscanf(buftmp, "%c ", &cmd); - printk("------zhangqing: get cmd = %c\n", cmd); - switch(cmd) { - - case 'w': - sscanf(buftmp, "%c %x %x ", &cmd, &getdata[0],&getdata[1]); - regAddr = (u16)(getdata[0] & 0xff); - data = (u8)(getdata[1] & 0xff); - printk("get value = %x\n", data); - - rk808_i2c_write(rk808, regAddr, 1, data); - rk808_i2c_read(rk808, regAddr, 1, &data); - printk("%x %x\n", getdata[1],data); - - break; - - case 'r': - sscanf(buftmp, "%c %x ", &cmd, &getdata[0]); - printk("CMD : %c %x\n", cmd, getdata[0]); - - regAddr = (u16)(getdata[0] & 0xff); - rk808_i2c_read(rk808, regAddr, 1, &data); - printk("%x %x\n", getdata[0],data); - - break; + sscanf(buftmp, "%c ", &cmd); + printk("------zhangqing: get cmd = %c\n", cmd); + switch (cmd) { + case 'w': + sscanf(buftmp, "%c %x %x ", &cmd, &getdata[0], &getdata[1]); + regAddr = (u8)(getdata[0] & 0xff); + data = (u8)(getdata[1] & 0xff); + printk("get value = %x\n", data); + + rk808_i2c_write(rk808, regAddr, 1, data); + rk808_i2c_read(rk808, regAddr, 1, &data); + printk("%x %x\n", getdata[1], data); + break; + case 'r': + sscanf(buftmp, "%c %x ", &cmd, &getdata[0]); + printk("CMD : %c %x\n", cmd, getdata[0]); - default: - printk("Unknown command\n"); - break; - } -} - return n; + regAddr = (u8)(getdata[0] & 0xff); + rk808_i2c_read(rk808, regAddr, 1, &data); + printk("%x %x\n", getdata[0], data); + break; + default: + printk("Unknown command\n"); + break; + } + return n; } static ssize_t rk808_test_show(struct kobject *kobj, struct kobj_attribute *attr, diff --git a/drivers/mfd/rk818.c b/drivers/mfd/rk818.c index 19f4e9df6f11..f3ccb1188ac5 100755 --- a/drivers/mfd/rk818.c +++ b/drivers/mfd/rk818.c @@ -862,7 +862,7 @@ static ssize_t rk818_test_store(struct kobject *kobj, struct kobj_attribute *att const char *buf, size_t n) { u32 getdata[8]; - u16 regAddr; + u8 regAddr; u8 data; char cmd; const char *buftmp = buf; @@ -873,45 +873,32 @@ static ssize_t rk818_test_store(struct kobject *kobj, struct kobj_attribute *att * R regAddr(8Bit) * C gpio_name(poweron/powerhold/sleep/boot0/boot1) value(H/L) */ - regAddr = (u16)(getdata[0] & 0xff); - if (strncmp(buf, "start", 5) == 0) { - - - } else if (strncmp(buf, "stop", 4== 0) ){ - - } else{ - sscanf(buftmp, "%c ", &cmd); - printk("------zhangqing: get cmd = %c\n", cmd); - switch(cmd) { - - case 'w': - sscanf(buftmp, "%c %x %x ", &cmd, &getdata[0],&getdata[1]); - regAddr = (u16)(getdata[0] & 0xff); - data = (u8)(getdata[1] & 0xff); - printk("get value = %x\n", data); - - rk818_i2c_write(rk818, regAddr, 1, data); - rk818_i2c_read(rk818, regAddr, 1, &data); - printk("%x %x\n", getdata[1],data); - - break; - - case 'r': - sscanf(buftmp, "%c %x ", &cmd, &getdata[0]); - printk("CMD : %c %x\n", cmd, getdata[0]); - - regAddr = (u16)(getdata[0] & 0xff); - rk818_i2c_read(rk818, regAddr, 1, &data); - printk("%x %x\n", getdata[0],data); - - break; + sscanf(buftmp, "%c ", &cmd); + printk("------zhangqing: get cmd = %c\n", cmd); + switch (cmd) { + case 'w': + sscanf(buftmp, "%c %x %x ", &cmd, &getdata[0], &getdata[1]); + regAddr = (u8)(getdata[0] & 0xff); + data = (u8)(getdata[1] & 0xff); + printk("get value = %x\n", data); + + rk818_i2c_write(rk818, regAddr, 1, data); + rk818_i2c_read(rk818, regAddr, 1, &data); + printk("%x %x\n", getdata[1], data); + break; + case 'r': + sscanf(buftmp, "%c %x ", &cmd, &getdata[0]); + printk("CMD : %c %x\n", cmd, getdata[0]); - default: - printk("Unknown command\n"); - break; - } -} - return n; + regAddr = (u8)(getdata[0] & 0xff); + rk818_i2c_read(rk818, regAddr, 1, &data); + printk("%x %x\n", getdata[0], data); + break; + default: + printk("Unknown command\n"); + break; + } + return n; } static ssize_t rk818_test_show(struct kobject *kobj, struct kobj_attribute *attr, -- 2.34.1