aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-17 17:42:30 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:42:11 -0400
commit07e73fbb2d52434e6b61019326f35040357e8efb (patch)
tree0f5ec2578728861e79220cbc514a9c8241a32245
parent4277163c2a451fd8db0883cde5e55cf61a70fe85 (diff)
mfd: Constify WM8994 write path
Allow const buffers to be passed in without type safety issues. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/wm8994-core.c8
-rw-r--r--include/linux/mfd/wm8994/core.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 475bd50d5528..3f5b7cc85f1d 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -97,9 +97,9 @@ int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
97EXPORT_SYMBOL_GPL(wm8994_bulk_read); 97EXPORT_SYMBOL_GPL(wm8994_bulk_read);
98 98
99static int wm8994_write(struct wm8994 *wm8994, unsigned short reg, 99static int wm8994_write(struct wm8994 *wm8994, unsigned short reg,
100 int bytes, void *src) 100 int bytes, const void *src)
101{ 101{
102 u16 *buf = src; 102 const u16 *buf = src;
103 int i; 103 int i;
104 104
105 BUG_ON(bytes % 2); 105 BUG_ON(bytes % 2);
@@ -146,7 +146,7 @@ EXPORT_SYMBOL_GPL(wm8994_reg_write);
146 * @buf: Buffer to write from. Data must be big-endian formatted. 146 * @buf: Buffer to write from. Data must be big-endian formatted.
147 */ 147 */
148int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg, 148int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg,
149 int count, u16 *buf) 149 int count, const u16 *buf)
150{ 150{
151 int ret; 151 int ret;
152 152
@@ -583,7 +583,7 @@ static int wm8994_i2c_read_device(struct wm8994 *wm8994, unsigned short reg,
583} 583}
584 584
585static int wm8994_i2c_write_device(struct wm8994 *wm8994, unsigned short reg, 585static int wm8994_i2c_write_device(struct wm8994 *wm8994, unsigned short reg,
586 int bytes, void *src) 586 int bytes, const void *src)
587{ 587{
588 struct i2c_client *i2c = wm8994->control_data; 588 struct i2c_client *i2c = wm8994->control_data;
589 struct i2c_msg xfer[2]; 589 struct i2c_msg xfer[2];
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index cb7d3ae7da8f..f0b69cdae41c 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -59,7 +59,7 @@ struct wm8994 {
59 int (*read_dev)(struct wm8994 *wm8994, unsigned short reg, 59 int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
60 int bytes, void *dest); 60 int bytes, void *dest);
61 int (*write_dev)(struct wm8994 *wm8994, unsigned short reg, 61 int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
62 int bytes, void *src); 62 int bytes, const void *src);
63 63
64 void *control_data; 64 void *control_data;
65 65
@@ -89,7 +89,7 @@ int wm8994_set_bits(struct wm8994 *wm8994, unsigned short reg,
89int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg, 89int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
90 int count, u16 *buf); 90 int count, u16 *buf);
91int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg, 91int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg,
92 int count, u16 *buf); 92 int count, const u16 *buf);
93 93
94 94
95/* Helper to save on boilerplate */ 95/* Helper to save on boilerplate */