[08/10] ASoC: Intel: Skylake: Remove get dsp_ops in cleanup routine

Commit Message

Jeeja KP March 7, 2017, 6:14 p.m. UTC

From: G Kranthi <[e-mail]>

dsp ops is already set in init, so use the this in cleanup routine
instead of again retrieving it.

Signed-off-by: G Kranthi <[e-mail]>
Signed-off-by: Jeeja KP <[e-mail]>
---
 sound/soc/intel/skylake/skl-messages.c | 8 ++------
 sound/soc/intel/skylake/skl-sst-ipc.h  | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

Comments

kernel test robot March 10, 2017, 4:40 a.m. UTC | #1

Hi Kranthi,

[auto build test WARNING on asoc/for-next]
[also build test WARNING on v4.11-rc1 next-20170309]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/jeeja-kp-intel-com/ASoC-Intel-Skylake-Driver-updates/20170310-104533
base:   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: i386-randconfig-s1-201710 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All warnings (new ones prefixed by >>):

   sound/soc/intel/skylake/skl-messages.c: In function 'skl_init_dsp':
>> sound/soc/intel/skylake/skl-messages.c:277:24: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
     skl->skl_sst->dsp_ops = ops;
                           ^

vim +/const +277 sound/soc/intel/skylake/skl-messages.c

   261			dev_err(bus->dev, "ioremap error\n");
   262			return -ENXIO;
   263		}
   264	
   265		ops = skl_get_dsp_ops(skl->pci->device);
   266		if (!ops)
   267			return -EIO;
   268	
   269		loader_ops = ops->loader_ops();
   270		ret = ops->init(bus->dev, mmio_base, irq,
   271					skl->fw_name, loader_ops,
   272					&skl->skl_sst);
   273	
   274		if (ret < 0)
   275			return ret;
   276	
 > 277		skl->skl_sst->dsp_ops = ops;
   278		dev_dbg(bus->dev, "dsp registration status=%d\n", ret);
   279	
   280		return ret;
   281	}
   282	
   283	int skl_free_dsp(struct skl *skl)
   284	{
   285		struct hdac_ext_bus *ebus = &skl->ebus;

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 29523dd..ba1ec97 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -274,6 +274,7 @@  int skl_init_dsp(struct skl *skl)
 	if (ret < 0)
 		return ret;
 
+	skl->skl_sst->dsp_ops = ops;
 	dev_dbg(bus->dev, "dsp registration status=%d\n", ret);
 
 	return ret;
@@ -284,16 +285,11 @@  int skl_free_dsp(struct skl *skl)
 	struct hdac_ext_bus *ebus = &skl->ebus;
 	struct hdac_bus *bus = ebus_to_hbus(ebus);
 	struct skl_sst *ctx = skl->skl_sst;
-	const struct skl_dsp_ops *ops;
 
 	/* disable  ppcap interrupt */
 	snd_hdac_ext_bus_ppcap_int_enable(&skl->ebus, false);
 
-	ops = skl_get_dsp_ops(skl->pci->device);
-	if (!ops)
-		return -EIO;
-
-	ops->cleanup(bus->dev, ctx);
+	ctx->dsp_ops->cleanup(bus->dev, ctx);
 
 	if (ctx->dsp->addr.lpe)
 		iounmap(ctx->dsp->addr.lpe);
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 9660ace..87ae03e 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -105,6 +105,8 @@  struct skl_sst {
 	void (*update_d0i3c)(struct device *dev, bool enable);
 
 	struct skl_d0i3_data d0i3;
+
+	struct skl_dsp_ops *dsp_ops;
 };
 
 struct skl_ipc_init_instance_msg {