From 250ff749b24030cb463c05466c1309fec115cf46 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Wed, 20 May 2015 15:17:32 +0800 Subject: [PATCH] rk1000: fix compilation warning --- drivers/mfd/rk1000-core.c | 2 +- drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/rk1000-core.c b/drivers/mfd/rk1000-core.c index 474e944be271..ce5974f4b1f5 100755 --- a/drivers/mfd/rk1000-core.c +++ b/drivers/mfd/rk1000-core.c @@ -106,7 +106,7 @@ int rk1000_i2c_recv(const u8 addr, const u8 reg, const char *buf) return (ret == 2) ? 0 : -1; } -static ssize_t rk1000_show(struct kobject *kobj, struct kobj_attribute *attr,char *buf) +static ssize_t rk1000_show(struct device *dev, struct device_attribute *attr, char *buf) { int ret=-1; int i=0; diff --git a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c index f73450f70efa..3c8e4e81d6a8 100755 --- a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c +++ b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c @@ -21,7 +21,7 @@ int rk1000_tv_ntsc_init(void) int ret; if(cvbsformat>=0){ - return; + return 0; } for (i = 0; i < sizeof(tv_encoder_regs); i++) { @@ -53,7 +53,7 @@ int rk1000_tv_pal_init(void) int ret; if(cvbsformat>=0){ - return; + return 0; } for (i = 0; i < sizeof(tv_encoder_regs); i++) { -- 2.34.1