1 files changed, 27 insertions, 27 deletions

diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 70c3a604c381..61a8e4756a2b 100644
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -16,7 +16,7 @@
 #include "../common/sst-dsp.h"
 #include "../common/sst-dsp-priv.h"
 #include "../common/sst-ipc.h"
-#include "skl-sst-ipc.h"
+#include "skl.h"
 
 #define SKL_BASEFW_TIMEOUT      300
 #define SKL_INIT_TIMEOUT        1000
@@ -66,7 +66,7 @@ static int skl_transfer_firmware(struct sst_dsp *ctx,
 static int skl_load_base_firmware(struct sst_dsp *ctx)
 {
         int ret = 0, i;
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         struct firmware stripped_fw;
         u32 reg;
 
@@ -161,7 +161,7 @@ static int skl_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)
 {
         int ret;
         struct skl_ipc_dxstate_info dx;
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);
 
         /* If core0 is being turned on, we need to load the FW */
@@ -215,7 +215,7 @@ static int skl_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)
 {
         int ret;
         struct skl_ipc_dxstate_info dx;
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);
 
         dx.core_mask = core_mask;
@@ -332,7 +332,7 @@ static int skl_transfer_module(struct sst_dsp *ctx, const void *data,
                         u32 size, u16 mod_id, u8 table_id, bool is_module)
 {
         int ret, bytes_left, curr_pos;
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         skl->mod_load_complete = false;
 
         bytes_left = ctx->cl_dev.ops.cl_copy_to_dmabuf(ctx, data, size, false);
@@ -384,7 +384,7 @@ out:
 static int
 skl_load_library(struct sst_dsp *ctx, struct skl_lib_info *linfo, int lib_count)
 {
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         struct firmware stripped_fw;
         int ret, i;
 
@@ -413,8 +413,7 @@ static int skl_load_module(struct sst_dsp *ctx, u16 mod_id, u8 *guid)
         int ret = 0;
         char mod_name[64]; /* guid str = 32 chars + 4 hyphens */
 
-        snprintf(mod_name, sizeof(mod_name), "%s%pUL%s",
-                                             "intel/dsp_fw_", guid, ".bin");
+        snprintf(mod_name, sizeof(mod_name), "intel/dsp_fw_%pUL.bin", guid);
 
         module_entry = skl_module_get_from_id(ctx, mod_id);
         if (module_entry == NULL) {
@@ -443,7 +442,7 @@ static int skl_load_module(struct sst_dsp *ctx, u16 mod_id, u8 *guid)
 static int skl_unload_module(struct sst_dsp *ctx, u16 mod_id)
 {
         int usage_cnt;
-        struct skl_sst *skl = ctx->thread_context;
+        struct skl_dev *skl = ctx->thread_context;
         int ret = 0;
 
         usage_cnt = skl_put_module(ctx, mod_id);
@@ -518,9 +517,10 @@ static struct sst_dsp_device skl_dev = {
 };
 
 int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
-                const char *fw_name, struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp)
+                const char *fw_name, struct skl_dsp_loader_ops dsp_ops,
+                struct skl_dev **dsp)
 {
-        struct skl_sst *skl;
+        struct skl_dev *skl;
         struct sst_dsp *sst;
         int ret;
 
@@ -554,10 +554,10 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
 }
 EXPORT_SYMBOL_GPL(skl_sst_dsp_init);
 
-int skl_sst_init_fw(struct device *dev, struct skl_sst *ctx)
+int skl_sst_init_fw(struct device *dev, struct skl_dev *skl)
 {
         int ret;
-        struct sst_dsp *sst = ctx->dsp;
+        struct sst_dsp *sst = skl->dsp;
 
         ret = sst->fw_ops.load_fw(sst);
         if (ret < 0) {
@@ -567,32 +567,32 @@ int skl_sst_init_fw(struct device *dev, struct skl_sst *ctx)
 
         skl_dsp_init_core_state(sst);
 
-        if (ctx->lib_count > 1) {
-                ret = sst->fw_ops.load_library(sst, ctx->lib_info,
-                                                ctx->lib_count);
+        if (skl->lib_count > 1) {
+                ret = sst->fw_ops.load_library(sst, skl->lib_info,
+                                                skl->lib_count);
                 if (ret < 0) {
                         dev_err(dev, "Load Library failed : %x\n", ret);
                         return ret;
                 }
         }
-        ctx->is_first_boot = false;
+        skl->is_first_boot = false;
 
         return 0;
 }
 EXPORT_SYMBOL_GPL(skl_sst_init_fw);
 
-void skl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx)
+void skl_sst_dsp_cleanup(struct device *dev, struct skl_dev *skl)
 {
 
-        if (ctx->dsp->fw)
-                release_firmware(ctx->dsp->fw);
-        skl_clear_module_table(ctx->dsp);
-        skl_freeup_uuid_list(ctx);
-        skl_ipc_free(&ctx->ipc);
-        ctx->dsp->ops->free(ctx->dsp);
-        if (ctx->boot_complete) {
-                ctx->dsp->cl_dev.ops.cl_cleanup_controller(ctx->dsp);
-                skl_cldma_int_disable(ctx->dsp);
+        if (skl->dsp->fw)
+                release_firmware(skl->dsp->fw);
+        skl_clear_module_table(skl->dsp);
+        skl_freeup_uuid_list(skl);
+        skl_ipc_free(&skl->ipc);
+        skl->dsp->ops->free(skl->dsp);
+        if (skl->boot_complete) {
+                skl->dsp->cl_dev.ops.cl_cleanup_controller(skl->dsp);
+                skl_cldma_int_disable(skl->dsp);
         }
 }
 EXPORT_SYMBOL_GPL(skl_sst_dsp_cleanup);