adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

mfd: compile fix for twl4030 renaming

Browse source 
Caused by commit 0b83ddebc6 ("MFD:
twl4030: add twl4030_codec MFD as a new child to the core") interacting
with commit b07682b605 ("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>
This commit is contained in:
Stephen Rothwell 2009-12-15 16:33:10 +11:00 committed by Linus Torvalds
parent d180ec5d34
commit 8bea8672ed
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mfd/twl4030-codec.c
View file

@ -26,7 +26,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-codec.h>
@ -56,7 +56,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
u8 val; u8 val;
twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg); codec->resource[id].reg);
if (enable) if (enable)
@ -64,7 +64,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
else else
val &= ~codec->resource[id].mask; val &= ~codec->resource[id].mask;
twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, codec->resource[id].reg); val, codec->resource[id].reg);
return val; return val;
@ -75,7 +75,7 @@ static inline int twl4030_codec_get_resource(enum twl4030_codec_res id)
struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
u8 val; u8 val;
twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg); codec->resource[id].reg);
return val; return val;
@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid audio_mclk\n"); dev_err(&pdev->dev, "Invalid audio_mclk\n");
return -EINVAL; return -EINVAL;
} }
twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL); val, TWL4030_REG_APLL_CTL);
codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL); codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);