summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gong <B38343@freescale.com>2011-12-28 11:43:08 +0800
committerRobin Gong <B38343@freescale.com>2011-12-28 13:43:35 +0800
commit465d5a7b47bddae3a9fcce12e8a3b96d8be57d88 (patch)
tree764e00bc88252143184aa22f4fc13c44985c2f38
parent258ba222fccee375e50454065263309fb839c72e (diff)
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>
-rw-r--r--drivers/mfd/pfuze-core.c5
-rw-r--r--include/linux/mfd/pfuze.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mfd/pfuze-core.c b/drivers/mfd/pfuze-core.c
index ae3a37e24025..5efc5525fdc9 100644
--- 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 a4c51c5c43a9..42976420203d 100644
--- 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