aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <Nancy.Chen@freescale.com>2011-11-02 14:38:27 -0500
committerEric Miao <eric.miao@canonical.com>2011-11-10 07:38:59 +0800
commitf002713362e7d9d51cf1a0fb540a9a1e375c8e62 (patch)
tree09760419a13759d772c2f21625c9ccb4913d839e
parentf4cd66d77a153569abf88820edc673f43cba1034 (diff)
downloadlinux-linaro-f002713362e7d9d51cf1a0fb540a9a1e375c8e62.tar.gz
ENGR00161292 [mx6q] Fix incompatible pointer warnings
Fix build warnings regarding initialization from incompatible pointer type. Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
-rw-r--r--drivers/regulator/anatop-regulator.c5
-rw-r--r--drivers/video/backlight/pwm_bl.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 8eb76587c8f..61ad1c2a7d2 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -27,12 +27,13 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/anatop-regulator.h>
-static int anatop_set_voltage(struct regulator_dev *reg, int MiniV, int uv)
+static int anatop_set_voltage(struct regulator_dev *reg, int min_uV,
+ int max_uV, unsigned *selector)
{
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
if (anatop_reg->rdata->set_voltage)
- return anatop_reg->rdata->set_voltage(anatop_reg, uv);
+ return anatop_reg->rdata->set_voltage(anatop_reg, max_uV);
else
return -ENOTSUPP;
}
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index bb29bb4545a..79bf1f40bca 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -62,7 +62,8 @@ static int pwm_backlight_get_brightness(struct backlight_device *bl)
return bl->props.brightness;
}
-static int pwm_backlight_check_fb(struct fb_info *info)
+static int pwm_backlight_check_fb(struct backlight_device *bl,
+ struct fb_info *info)
{
char *id = info->fix.id;
if (!strcmp(id, "DISP3 BG"))