1. Patchew
  2. linux
  3. [PATCH v2 0/8] Refactor imx drivers and introduce support for imx95
  4. View patch

[PATCH v2 4/8] ASoC: SOF: imx8: shuffle structure and function definitions

Laurentiu Mihalcea posted 8 patches 10 months, 1 week ago
There is a newer version of this series
[PATCH v2 4/8] ASoC: SOF: imx8: shuffle structure and function definitions
Posted by Laurentiu Mihalcea 10 months, 1 week ago 
From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

Shuffle the definitions of some structures and functions such that
they are better grouped. This is purely a cosmetic change.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 sound/soc/sof/imx/imx8.c | 86 ++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 52dff369d9cf..5d6524d695e2 100644
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -41,6 +41,49 @@
 #define MBOX_OFFSET	0x800000
 #define MBOX_SIZE	0x1000
 
+static struct snd_soc_dai_driver imx8_dai[] = {
+	IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
+	IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
+};
+
+static struct snd_sof_dsp_ops sof_imx8_ops;
+
+static int imx8_ops_init(struct snd_sof_dev *sdev)
+{
+	/* first copy from template */
+	memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
+
+	/* then set common imx8 ops */
+	sof_imx8_ops.dbg_dump = imx8_dump;
+	sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
+	sof_imx8_ops.debugfs_add_region_item =
+		snd_sof_debugfs_add_region_item_iomem;
+
+	/* ... and finally set DAI driver */
+	sof_imx8_ops.drv = get_chip_info(sdev)->drv;
+	sof_imx8_ops.num_drv = get_chip_info(sdev)->num_drv;
+
+	return 0;
+}
+
+static int imx8_probe(struct snd_sof_dev *sdev)
+{
+	struct imx_sc_ipc *sc_ipc_handle;
+	struct imx_common_data *common;
+	int ret;
+
+	common = sdev->pdata->hw_pdata;
+
+	ret = imx_scu_get_handle(&sc_ipc_handle);
+	if (ret < 0)
+		return dev_err_probe(sdev->dev, ret,
+				     "failed to fetch SC IPC handle\n");
+
+	common->chip_pdata = sc_ipc_handle;
+
+	return 0;
+}
+
 /*
  * DSP control.
  */
@@ -100,49 +143,6 @@ static int imx8_run(struct snd_sof_dev *sdev)
 	return 0;
 }
 
-static int imx8_probe(struct snd_sof_dev *sdev)
-{
-	struct imx_sc_ipc *sc_ipc_handle;
-	struct imx_common_data *common;
-	int ret;
-
-	common = sdev->pdata->hw_pdata;
-
-	ret = imx_scu_get_handle(&sc_ipc_handle);
-	if (ret < 0)
-		return dev_err_probe(sdev->dev, ret,
-				     "failed to fetch SC IPC handle\n");
-
-	common->chip_pdata = sc_ipc_handle;
-
-	return 0;
-}
-
-static struct snd_soc_dai_driver imx8_dai[] = {
-	IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
-	IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
-};
-
-static struct snd_sof_dsp_ops sof_imx8_ops;
-
-static int imx8_ops_init(struct snd_sof_dev *sdev)
-{
-	/* first copy from template */
-	memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
-
-	/* then set common imx8 ops */
-	sof_imx8_ops.dbg_dump = imx8_dump;
-	sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
-	sof_imx8_ops.debugfs_add_region_item =
-		snd_sof_debugfs_add_region_item_iomem;
-
-	/* ... and finally set DAI driver */
-	sof_imx8_ops.drv = get_chip_info(sdev)->drv;
-	sof_imx8_ops.num_drv = get_chip_info(sdev)->num_drv;
-
-	return 0;
-}
-
 static const struct imx_chip_ops imx8_chip_ops = {
 	.probe = imx8_probe,
 	.core_kick = imx8_run,
-- 
2.34.1
Re: [PATCH v2 4/8] ASoC: SOF: imx8: shuffle structure and function definitions
Posted by Frank Li 10 months, 1 week ago 
On Wed, Feb 05, 2025 at 03:30:18PM -0500, Laurentiu Mihalcea wrote:
> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
>
> Shuffle the definitions of some structures and functions such that
> they are better grouped. This is purely a cosmetic change.
>
> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
> Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>

I don't think this patch is neccessary. It have not look better after
change position.

Frank

> ---
>  sound/soc/sof/imx/imx8.c | 86 ++++++++++++++++++++--------------------
>  1 file changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
> index 52dff369d9cf..5d6524d695e2 100644
> --- a/sound/soc/sof/imx/imx8.c
> +++ b/sound/soc/sof/imx/imx8.c
> @@ -41,6 +41,49 @@
>  #define MBOX_OFFSET	0x800000
>  #define MBOX_SIZE	0x1000
>
> +static struct snd_soc_dai_driver imx8_dai[] = {
> +	IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
> +	IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
> +};
> +
> +static struct snd_sof_dsp_ops sof_imx8_ops;
> +
> +static int imx8_ops_init(struct snd_sof_dev *sdev)
> +{
> +	/* first copy from template */
> +	memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
> +
> +	/* then set common imx8 ops */
> +	sof_imx8_ops.dbg_dump = imx8_dump;
> +	sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
> +	sof_imx8_ops.debugfs_add_region_item =
> +		snd_sof_debugfs_add_region_item_iomem;
> +
> +	/* ... and finally set DAI driver */
> +	sof_imx8_ops.drv = get_chip_info(sdev)->drv;
> +	sof_imx8_ops.num_drv = get_chip_info(sdev)->num_drv;
> +
> +	return 0;
> +}
> +
> +static int imx8_probe(struct snd_sof_dev *sdev)
> +{
> +	struct imx_sc_ipc *sc_ipc_handle;
> +	struct imx_common_data *common;
> +	int ret;
> +
> +	common = sdev->pdata->hw_pdata;
> +
> +	ret = imx_scu_get_handle(&sc_ipc_handle);
> +	if (ret < 0)
> +		return dev_err_probe(sdev->dev, ret,
> +				     "failed to fetch SC IPC handle\n");
> +
> +	common->chip_pdata = sc_ipc_handle;
> +
> +	return 0;
> +}
> +
>  /*
>   * DSP control.
>   */
> @@ -100,49 +143,6 @@ static int imx8_run(struct snd_sof_dev *sdev)
>  	return 0;
>  }
>
> -static int imx8_probe(struct snd_sof_dev *sdev)
> -{
> -	struct imx_sc_ipc *sc_ipc_handle;
> -	struct imx_common_data *common;
> -	int ret;
> -
> -	common = sdev->pdata->hw_pdata;
> -
> -	ret = imx_scu_get_handle(&sc_ipc_handle);
> -	if (ret < 0)
> -		return dev_err_probe(sdev->dev, ret,
> -				     "failed to fetch SC IPC handle\n");
> -
> -	common->chip_pdata = sc_ipc_handle;
> -
> -	return 0;
> -}
> -
> -static struct snd_soc_dai_driver imx8_dai[] = {
> -	IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
> -	IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
> -};
> -
> -static struct snd_sof_dsp_ops sof_imx8_ops;
> -
> -static int imx8_ops_init(struct snd_sof_dev *sdev)
> -{
> -	/* first copy from template */
> -	memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
> -
> -	/* then set common imx8 ops */
> -	sof_imx8_ops.dbg_dump = imx8_dump;
> -	sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
> -	sof_imx8_ops.debugfs_add_region_item =
> -		snd_sof_debugfs_add_region_item_iomem;
> -
> -	/* ... and finally set DAI driver */
> -	sof_imx8_ops.drv = get_chip_info(sdev)->drv;
> -	sof_imx8_ops.num_drv = get_chip_info(sdev)->num_drv;
> -
> -	return 0;
> -}
> -
>  static const struct imx_chip_ops imx8_chip_ops = {
>  	.probe = imx8_probe,
>  	.core_kick = imx8_run,
> --
> 2.34.1
>
Re: [PATCH v2 4/8] ASoC: SOF: imx8: shuffle structure and function definitions
Posted by Mark Brown 10 months, 1 week ago 
On Thu, Feb 06, 2025 at 11:18:00AM -0500, Frank Li wrote:
> On Wed, Feb 05, 2025 at 03:30:18PM -0500, Laurentiu Mihalcea wrote:

> > Shuffle the definitions of some structures and functions such that
> > they are better grouped. This is purely a cosmetic change.

> I don't think this patch is neccessary. It have not look better after
> change position.

The rest of the patches depend on this one (or there's some other
conflict with my current tree), please resend with this patch dropped.

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.