summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-03-01 13:35:48 -0800
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 10:42:02 +0100
commite9300066bbd21c4fba3c8c5475c6a21d9c97694e (patch)
tree9c3b402a3ed8ddfcca0a2f5c99305221fe620ad5
parent944dc03551f6e812c00e586edba84b28c52ffe8c (diff)
jz4740: silence warnings related to mfd_get_cell changes
mfd_get_cell returns a const, so change the jz4740 clients to store a const mfd cell. This silences type mismatch warnings. Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/hwmon/jz4740-hwmon.c2
-rw-r--r--drivers/power/jz4740-battery.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index 40f106d95af..fea292d4340 100644
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -32,7 +32,7 @@ struct jz4740_hwmon {
int irq;
- struct mfd_cell *cell;
+ const struct mfd_cell *cell;
struct device *hwmon;
struct completion read_completion;
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 0938650a466..763f894ed18 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -39,7 +39,7 @@ struct jz_battery {
int irq;
int charge_irq;
- struct mfd_cell *cell;
+ const struct mfd_cell *cell;
int status;
long voltage;