Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux-beck.git] / include / linux / mfd / wm8994 / core.h

diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index bfb221b3abf7d90079efbcb05b4c0073401c480a..62680914762434e2652a085e35de603d3e1855ac 100644 (file)
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -25,6 +25,7 @@ enum wm8994_type {
 
 struct regulator_dev;
 struct regulator_bulk_data;
+struct regmap;
 
 #define WM8994_NUM_GPIO_REGS 11
 #define WM8994_NUM_LDO_REGS   2
@@ -51,18 +52,12 @@ struct regulator_bulk_data;
 #define WM8994_IRQ_GPIO(x) (x + WM8994_IRQ_TEMP_WARN)
 
 struct wm8994 {
-       struct mutex io_lock;
        struct mutex irq_lock;
 
        enum wm8994_type type;
 
        struct device *dev;
-       int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
-                       int bytes, void *dest);
-       int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
-                        int bytes, const void *src);
-
-       void *control_data;
+       struct regmap *regmap;
 
        int gpio_base;
        int irq_base;