Unverified Commit 17b3f99a authored by Iulian Olaru's avatar Iulian Olaru Committed by Mark Brown
Browse files

ASoC: SOF: imx: Replace sdev->private with sdev->pdata->hw_pdata 



The correct way to save private data is to use sdev->pdata->hw_pdata.
Removed superfluous type-casts.

Signed-off-by: default avatarIulian Olaru <iulianolaru249@yahoo.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200825235040.1586478-7-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29c8e439

sound/soc/sof/imx/imx8.c

+5 −5
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct imx_dsp_ops dsp_ops = { 


static int imx8_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	struct imx8_priv *priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *priv = sdev->pdata->hw_pdata;



	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);
@@ -140,7 +140,7 @@ static int imx8_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 
 */

static int imx8x_run(struct snd_sof_dev *sdev)

{

	struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *dsp_priv = sdev->pdata->hw_pdata;

	int ret;



	ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP,
@@ -180,7 +180,7 @@ static int imx8x_run(struct snd_sof_dev *sdev) 


static int imx8_run(struct snd_sof_dev *sdev)

{

	struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *dsp_priv = sdev->pdata->hw_pdata;

	int ret;



	ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP,
@@ -213,7 +213,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->private = priv;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;
@@ -339,7 +339,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 


static int imx8_remove(struct snd_sof_dev *sdev)

{

	struct imx8_priv *priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *priv = sdev->pdata->hw_pdata;

	int i;



	platform_device_unregister(priv->ipc_dev);

sound/soc/sof/imx/imx8m.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct imx_dsp_ops imx8m_dsp_ops = { 


static int imx8m_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	struct imx8m_priv *priv = (struct imx8m_priv *)sdev->private;

	struct imx8m_priv *priv = sdev->pdata->hw_pdata;



	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);
@@ -133,7 +133,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->private = priv;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;
@@ -209,7 +209,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 


static int imx8m_remove(struct snd_sof_dev *sdev)

{

	struct imx8m_priv *priv = (struct imx8m_priv *)sdev->private;

	struct imx8m_priv *priv = sdev->pdata->hw_pdata;



	platform_device_unregister(priv->ipc_dev);