Skip to content

Commit

Permalink
mfd: compile fix for twl4030 renaming
Browse files Browse the repository at this point in the history
Caused by commit 0b83dde ("MFD:
twl4030: add twl4030_codec MFD as a new child to the core") interacting
with commit b07682b ("mfd: Rename
twl4030* driver files to enable re-use").

This file seems to have been missed in the renaming.

Signed-off-by: Stephen Rothwell <[email protected]>
Acked-by: Peter Ujfalusi <[email protected]>
Acked-by: Mark Brown <[email protected]>
Acked-by: Tony Lindgren <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
sfrothwell authored and torvalds committed Dec 15, 2009
1 parent d180ec5 commit 8bea867
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/mfd/twl4030-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
#include <linux/i2c/twl4030.h>
#include <linux/i2c/twl.h>
#include <linux/mfd/core.h>
#include <linux/mfd/twl4030-codec.h>

Expand Down Expand Up @@ -56,15 +56,15 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
u8 val;

twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg);

if (enable)
val |= codec->resource[id].mask;
else
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);

return val;
Expand All @@ -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);
u8 val;

twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg);

return val;
Expand Down Expand Up @@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid audio_mclk\n");
return -EINVAL;
}
twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL);

codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);
Expand Down

0 comments on commit 8bea867

Please sign in to comment.