Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bea8672 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

mfd: compile fix for twl4030 renaming 



Caused by commit 0b83ddeb ("MFD:
twl4030: add twl4030_codec MFD as a new child to the core") interacting
with commit b07682b6 ("mfd: Rename
twl4030* driver files to enable re-use").

This file seems to have been missed in the renaming.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d180ec5d

drivers/mfd/twl4030-codec.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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);