mfd: mfd_cell is now implicitly available to twl4030 drivers
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
7d76ac15ad
commit
0638d56fbb
|
@ -29,6 +29,7 @@
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/i2c/twl.h>
|
#include <linux/i2c/twl.h>
|
||||||
#include <linux/mfd/twl4030-codec.h>
|
#include <linux/mfd/twl4030-codec.h>
|
||||||
|
#include <linux/mfd/core.h>
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
|
||||||
|
@ -196,7 +197,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
|
||||||
|
|
||||||
static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
|
static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data;
|
struct twl4030_codec_vibra_data *pdata = mfd_get_data(pdev);
|
||||||
struct vibra_info *info;
|
struct vibra_info *info;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -209,14 +209,12 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
|
||||||
cell = &codec->cells[childs];
|
cell = &codec->cells[childs];
|
||||||
cell->name = "twl4030-codec";
|
cell->name = "twl4030-codec";
|
||||||
cell->platform_data = pdata->audio;
|
cell->platform_data = pdata->audio;
|
||||||
cell->data_size = sizeof(*pdata->audio);
|
|
||||||
childs++;
|
childs++;
|
||||||
}
|
}
|
||||||
if (pdata->vibra) {
|
if (pdata->vibra) {
|
||||||
cell = &codec->cells[childs];
|
cell = &codec->cells[childs];
|
||||||
cell->name = "twl4030-vibra";
|
cell->name = "twl4030-vibra";
|
||||||
cell->platform_data = pdata->vibra;
|
cell->platform_data = pdata->vibra;
|
||||||
cell->data_size = sizeof(*pdata->vibra);
|
|
||||||
childs++;
|
childs++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <linux/pm.h>
|
#include <linux/pm.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/mfd/core.h>
|
||||||
#include <linux/i2c/twl.h>
|
#include <linux/i2c/twl.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <sound/core.h>
|
#include <sound/core.h>
|
||||||
|
@ -732,7 +733,8 @@ static int aif_event(struct snd_soc_dapm_widget *w,
|
||||||
|
|
||||||
static void headset_ramp(struct snd_soc_codec *codec, int ramp)
|
static void headset_ramp(struct snd_soc_codec *codec, int ramp)
|
||||||
{
|
{
|
||||||
struct twl4030_codec_audio_data *pdata = codec->dev->platform_data;
|
struct twl4030_codec_audio_data *pdata =
|
||||||
|
mfd_get_data(to_platform_device(codec->dev));
|
||||||
unsigned char hs_gain, hs_pop;
|
unsigned char hs_gain, hs_pop;
|
||||||
struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
|
struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
|
||||||
/* Base values for ramp delay calculation: 2^19 - 2^26 */
|
/* Base values for ramp delay calculation: 2^19 - 2^26 */
|
||||||
|
@ -2297,7 +2299,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
|
||||||
|
|
||||||
static int __devinit twl4030_codec_probe(struct platform_device *pdev)
|
static int __devinit twl4030_codec_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct twl4030_codec_audio_data *pdata = pdev->dev.platform_data;
|
struct twl4030_codec_audio_data *pdata = mfd_get_data(pdev);
|
||||||
|
|
||||||
if (!pdata) {
|
if (!pdata) {
|
||||||
dev_err(&pdev->dev, "platform_data is missing\n");
|
dev_err(&pdev->dev, "platform_data is missing\n");
|
||||||
|
|
Loading…
Reference in New Issue