aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-12-15 00:33:10 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 12:33:36 -0500
commit8bea8672edfca7ec5f661cafb218f1205863b343 (patch)
tree72975d7c002fdab8b48478f18b107208744e0506
parentd180ec5d348e3a51836d723c182374483012c981 (diff)
mfd: compile fix for twl4030 renaming
Caused by commit 0b83ddebc6e884dc0221358cf68c461520fbdd8e ("MFD: twl4030: add twl4030_codec MFD as a new child to the core") interacting with commit b07682b6056eb6701f8cb86aa5800e6f2ea7919b ("mfd: Rename twl4030* driver files to enable re-use"). This file seems to have been missed in the renaming. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mfd/twl4030-codec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c
index 77b914907d7c..700b149c1b91 100644
--- a/drivers/mfd/twl4030-codec.c
+++ b/drivers/mfd/twl4030-codec.c
@@ -26,7 +26,7 @@
26#include <linux/kernel.h> 26#include <linux/kernel.h>
27#include <linux/fs.h> 27#include <linux/fs.h>
28#include <linux/platform_device.h> 28#include <linux/platform_device.h>
29#include <linux/i2c/twl4030.h> 29#include <linux/i2c/twl.h>
30#include <linux/mfd/core.h> 30#include <linux/mfd/core.h>
31#include <linux/mfd/twl4030-codec.h> 31#include <linux/mfd/twl4030-codec.h>
32 32
@@ -56,7 +56,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
56 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 56 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
57 u8 val; 57 u8 val;
58 58
59 twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, 59 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
60 codec->resource[id].reg); 60 codec->resource[id].reg);
61 61
62 if (enable) 62 if (enable)
@@ -64,7 +64,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
64 else 64 else
65 val &= ~codec->resource[id].mask; 65 val &= ~codec->resource[id].mask;
66 66
67 twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, 67 twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
68 val, codec->resource[id].reg); 68 val, codec->resource[id].reg);
69 69
70 return val; 70 return val;
@@ -75,7 +75,7 @@ static inline int twl4030_codec_get_resource(enum twl4030_codec_res id)
75 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 75 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
76 u8 val; 76 u8 val;
77 77
78 twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, 78 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
79 codec->resource[id].reg); 79 codec->resource[id].reg);
80 80
81 return val; 81 return val;
@@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
183 dev_err(&pdev->dev, "Invalid audio_mclk\n"); 183 dev_err(&pdev->dev, "Invalid audio_mclk\n");
184 return -EINVAL; 184 return -EINVAL;
185 } 185 }
186 twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, 186 twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
187 val, TWL4030_REG_APLL_CTL); 187 val, TWL4030_REG_APLL_CTL);
188 188
189 codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL); 189 codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);