ASoC: SOF: Use generic names for IPC types

Use the new SOF_IPC_TYPE_3, SOF_IPC_TYPE_4 in core code.

No functional changes, just renaming.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230919104226.32239-5-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index 8a7eb3cb019a688f0fdec11a29584eb4b5e52e19..febe372f9aa876301e6291efc6275fecc8294f27 100644 (file)
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -165,12 +165,12 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev)
 
        switch (sdev->pdata->ipc_type) {
 #if defined(CONFIG_SND_SOC_SOF_IPC3)
-       case SOF_IPC:
+       case SOF_IPC_TYPE_3:
                ops = &ipc3_ops;
                break;
 #endif
 #if defined(CONFIG_SND_SOC_SOF_IPC4)
-       case SOF_INTEL_IPC4:
+       case SOF_IPC_TYPE_4:
                ops = &ipc4_ops;
                break;
 #endif

diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c
index bd07f0472efd719b99df5cd9afd9bced1318bedc..0dca139322f3d22a14c7f6d45a9a343090a9f2bb 100644 (file)
--- a/sound/soc/sof/ipc3-dtrace.c
+++ b/sound/soc/sof/ipc3-dtrace.c
@@ -494,7 +494,7 @@ static int ipc3_dtrace_init(struct snd_sof_dev *sdev)
        int ret;
 
        /* dtrace is only supported with SOF_IPC */
-       if (sdev->pdata->ipc_type != SOF_IPC)
+       if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
                return -EOPNOTSUPP;
 
        if (sdev->fw_trace_data) {

diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c
index 1b04dcb332935f4df84f58662b0650a54ebd7a47..5c4e5ab31abff77dedffc60f8b685dfd7561b62e 100644 (file)
--- a/sound/soc/sof/sof-acpi-dev.c
+++ b/sound/soc/sof/sof-acpi-dev.c
@@ -74,20 +74,18 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc
 
        sof_pdata->desc = desc;
        sof_pdata->dev = &pdev->dev;
-       sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC];
+       sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
 
        /* alternate fw and tplg filenames ? */
        if (fw_path)
                sof_pdata->fw_filename_prefix = fw_path;
        else
-               sof_pdata->fw_filename_prefix =
-                       sof_pdata->desc->default_fw_path[SOF_IPC];
+               sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
 
        if (tplg_path)
                sof_pdata->tplg_filename_prefix = tplg_path;
        else
-               sof_pdata->tplg_filename_prefix =
-                       sof_pdata->desc->default_tplg_path[SOF_IPC];
+               sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
 
        /* set callback to be called on successful device probe to enable runtime_pm */
        sof_pdata->sof_probe_complete = sof_acpi_probe_complete;

diff --git a/sound/soc/sof/sof-client-ipc-msg-injector.c b/sound/soc/sof/sof-client-ipc-msg-injector.c
index 752d5320680f14449847543faecf42dd3daff69c..e249d3a9afb59d6f0fcf2e5a9c1ef16b81433da6 100644 (file)
--- a/sound/soc/sof/sof-client-ipc-msg-injector.c
+++ b/sound/soc/sof/sof-client-ipc-msg-injector.c
@@ -267,7 +267,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev,
        priv->max_msg_size = sof_client_get_ipc_max_payload_size(cdev);
        alloc_size = priv->max_msg_size;
 
-       if (priv->ipc_type == SOF_INTEL_IPC4)
+       if (priv->ipc_type == SOF_IPC_TYPE_4)
                alloc_size += sizeof(struct sof_ipc4_msg);
 
        priv->tx_buffer = devm_kmalloc(dev, alloc_size, GFP_KERNEL);
@@ -275,7 +275,7 @@ static int sof_msg_inject_probe(struct auxiliary_device *auxdev,
        if (!priv->tx_buffer || !priv->rx_buffer)
                return -ENOMEM;
 
-       if (priv->ipc_type == SOF_INTEL_IPC4) {
+       if (priv->ipc_type == SOF_IPC_TYPE_4) {
                struct sof_ipc4_msg *ipc4_msg;
 
                ipc4_msg = priv->tx_buffer;

diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c
index 390cdb8423ef93106ba878b2b0b78031b83c27c8..7cc9e8f18de73ff52c8ec9512ac7a226404d4f41 100644 (file)
--- a/sound/soc/sof/sof-client-probes.c
+++ b/sound/soc/sof/sof-client-probes.c
@@ -424,12 +424,12 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
 
        switch (sof_client_get_ipc_type(cdev)) {
 #ifdef CONFIG_SND_SOC_SOF_IPC4
-       case SOF_INTEL_IPC4:
+       case SOF_IPC_TYPE_4:
                priv->ipc_ops = &ipc4_probe_ops;
                break;
 #endif
 #ifdef CONFIG_SND_SOC_SOF_IPC3
-       case SOF_IPC:
+       case SOF_IPC_TYPE_3:
                priv->ipc_ops = &ipc3_probe_ops;
                break;
 #endif

diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c
index e1a8edbefff7e63cf6bfe29a2b4340967f09cb26..3f636b82173e77df180eaf5694e556f9952f2373 100644 (file)
--- a/sound/soc/sof/sof-client.c
+++ b/sound/soc/sof/sof-client.c
@@ -75,7 +75,7 @@ static int sof_register_ipc_flood_test(struct snd_sof_dev *sdev)
        int ret = 0;
        int i;
 
-       if (sdev->pdata->ipc_type != SOF_IPC)
+       if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
                return 0;
 
        for (i = 0; i < CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_NUM; i++) {
@@ -131,7 +131,7 @@ static inline void sof_unregister_ipc_msg_injector(struct snd_sof_dev *sdev) {}
 static int sof_register_ipc_kernel_injector(struct snd_sof_dev *sdev)
 {
        /* Only IPC3 supported right now */
-       if (sdev->pdata->ipc_type != SOF_IPC)
+       if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
                return 0;
 
        return sof_client_dev_register(sdev, "kernel_injector", 0, NULL, 0);
@@ -287,12 +287,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_dev_unregister, SND_SOC_SOF_CLIENT);
 int sof_client_ipc_tx_message(struct sof_client_dev *cdev, void *ipc_msg,
                              void *reply_data, size_t reply_bytes)
 {
-       if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
+       if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
                struct sof_ipc_cmd_hdr *hdr = ipc_msg;
 
                return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, hdr->size,
                                          reply_data, reply_bytes);
-       } else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
+       } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
                struct sof_ipc4_msg *msg = ipc_msg;
 
                return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, msg->data_size,
@@ -305,7 +305,7 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_tx_message, SND_SOC_SOF_CLIENT);
 
 int sof_client_ipc_rx_message(struct sof_client_dev *cdev, void *ipc_msg, void *msg_buf)
 {
-       if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
+       if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
                struct sof_ipc_cmd_hdr *hdr = ipc_msg;
 
                if (hdr->size < sizeof(hdr)) {
@@ -324,12 +324,12 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc_rx_message, SND_SOC_SOF_CLIENT);
 int sof_client_ipc_set_get_data(struct sof_client_dev *cdev, void *ipc_msg,
                                bool set)
 {
-       if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
+       if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
                struct sof_ipc_cmd_hdr *hdr = ipc_msg;
 
                return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg, hdr->size,
                                            set);
-       } else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
+       } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
                struct sof_ipc4_msg *msg = ipc_msg;
 
                return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg,
@@ -345,7 +345,7 @@ struct sof_ipc4_fw_module *sof_client_ipc4_find_module(struct sof_client_dev *c,
 {
        struct snd_sof_dev *sdev = c->sdev;
 
-       if (sdev->pdata->ipc_type == SOF_INTEL_IPC4)
+       if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4)
                return sof_ipc4_find_module_by_uuid(sdev, uuid);
        dev_err(sdev->dev, "Only supported with IPC4\n");
 
@@ -463,11 +463,11 @@ void sof_client_ipc_rx_dispatcher(struct snd_sof_dev *sdev, void *msg_buf)
        struct sof_ipc_event_entry *event;
        u32 msg_type;
 
-       if (sdev->pdata->ipc_type == SOF_IPC) {
+       if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
                struct sof_ipc_cmd_hdr *hdr = msg_buf;
 
                msg_type = hdr->cmd & SOF_GLB_TYPE_MASK;
-       } else if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
+       } else if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
                struct sof_ipc4_msg *msg = msg_buf;
 
                msg_type = SOF_IPC4_NOTIFICATION_TYPE_GET(msg->primary);
@@ -497,10 +497,10 @@ int sof_client_register_ipc_rx_handler(struct sof_client_dev *cdev,
        if (!callback)
                return -EINVAL;
 
-       if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
+       if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
                if (!(ipc_msg_type & SOF_GLB_TYPE_MASK))
                        return -EINVAL;
-       } else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
+       } else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
                if (!(ipc_msg_type & SOF_IPC4_NOTIFICATION_TYPE_MASK))
                        return -EINVAL;
        } else {

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index 53faeccedd4f0ddb9aca3fd817dbfe09d6647927..b0e8bd06f78ae5a2275a529be1c984dc9c268c69 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -64,17 +64,17 @@ int sof_of_probe(struct platform_device *pdev)
 
        sof_pdata->desc = desc;
        sof_pdata->dev = &pdev->dev;
-       sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC];
+       sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
 
        if (fw_path)
                sof_pdata->fw_filename_prefix = fw_path;
        else
-               sof_pdata->fw_filename_prefix = sof_pdata->desc->default_fw_path[SOF_IPC];
+               sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
 
        if (tplg_path)
                sof_pdata->tplg_filename_prefix = tplg_path;
        else
-               sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path[SOF_IPC];
+               sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
 
        /* set callback to be called on successful device probe to enable runtime_pm */
        sof_pdata->sof_probe_complete = sof_of_probe_complete;