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

Commit dab1547a authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

asoc: wm8400-codec: Use mfd_data instead of driver_data 



Use mfd_data for passing information from mfd drivers to soc
clients.  The mfd_cell's driver_data field is being phased out.

Clients that were using driver_data now access .mfd_data
via mfd_get_data().

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d5776337

drivers/mfd/wm8400-core.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int wm8400_register_codec(struct wm8400 *wm8400) 
{

	struct mfd_cell cell = {

		.name = "wm8400-codec",

		.driver_data = wm8400,

		.mfd_data = wm8400,

	};



	return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);

sound/soc/codecs/wm8400.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/mfd/wm8400-audio.h>

#include <linux/mfd/wm8400-private.h>

#include <linux/mfd/core.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -1377,7 +1378,7 @@ static void wm8400_probe_deferred(struct work_struct *work) 


static int wm8400_codec_probe(struct snd_soc_codec *codec)

{

	struct wm8400 *wm8400 = dev_get_platdata(codec->dev);

	struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev));

	struct wm8400_priv *priv;

	int ret;

	u16 reg;