ENGR00171001-2 MX6Q PFUZE100: fix build warnings

fix build warnings on pfuze driver:

arch/arm/mach-mx6/mx6q_sabreauto_pmic_pfuze100.c:388:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:523:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:412:
  warning: 'pfuze_add_subdevice' defined but not used

Signed-off-by: Robin Gong <B38343@freescale.com>

diff --git a/drivers/mfd/pfuze-core.c b/drivers/mfd/pfuze-core.c
index ae3a37e24025a4c9cdf51d64cfa11130bcc316b3..5efc5525fdc9da91862cdb94e0b7001424689720 100644 (file)
--- a/drivers/mfd/pfuze-core.c
+++ b/drivers/mfd/pfuze-core.c
@@ -409,11 +409,6 @@ static int pfuze_add_subdevice_pdata(struct mc_pfuze *mc_pfuze,
                               0);
 }
 
-static int pfuze_add_subdevice(struct mc_pfuze *mc_pfuze, const char *format)
-{
-       return pfuze_add_subdevice_pdata(mc_pfuze, format, NULL, 0);
-}
-
 static ssize_t pfuze_show(struct device *dev,
                          struct device_attribute *attr, char *buf)
 {

diff --git a/include/linux/mfd/pfuze.h b/include/linux/mfd/pfuze.h
index a4c51c5c43a95afb47a57e4ffce802009e2ac122..42976420203dec4ae69816044299115b3a3002d4 100644 (file)
--- a/include/linux/mfd/pfuze.h
+++ b/include/linux/mfd/pfuze.h
@@ -105,6 +105,6 @@ struct pfuze_platform_data {
 #define PFUZE_USE_REGULATOR    (1 << 0)
        unsigned int flags;
        int num_regulators;
-       struct fuze_regulator_init_data *regulators;
+       struct pfuze_regulator_init_data *regulators;
 };
 #endif