ENGR00161292 [mx6q] Fix incompatible pointer warnings

Fix build warnings regarding initialization from incompatible pointer type.

Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>

diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 8eb76587c8fa3593b951f4aa0202c13a7c19d13b..61ad1c2a7d26d58ac1922fb014d5075999560f4e 100644 (file)
--- 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 57545654d7a133da3da57adc468fca79f5eb2b43..5d5c43bc6d1b94862633d3bdf57c1ab2b80d28af 100644 (file)
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -63,7 +63,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"))