Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / twl4030-codec.c

diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c
index 9a4b196d6deb64751d8e4981bb81de8074f5e231..c02fded316c9f1ce1ee8fd2343b1bfb476399a9f 100644 (file)
--- a/drivers/mfd/twl4030-codec.c
+++ b/drivers/mfd/twl4030-codec.c
@@ -208,15 +208,13 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
        if (pdata->audio) {
                cell = &codec->cells[childs];
                cell->name = "twl4030-codec";
-               cell->platform_data = pdata->audio;
-               cell->data_size = sizeof(*pdata->audio);
+               cell->mfd_data = pdata->audio;
                childs++;
        }
        if (pdata->vibra) {
                cell = &codec->cells[childs];
                cell->name = "twl4030-vibra";
-               cell->platform_data = pdata->vibra;
-               cell->data_size = sizeof(*pdata->vibra);
+               cell->mfd_data = pdata->vibra;
                childs++;
        }