Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bd86a30 authored by G Kranthi's avatar G Kranthi Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Remove get dsp_ops in cleanup routine 



dsp ops is already set in init, so use this in cleanup routine
instead of again retrieving it. Also constify struct skl_dsp_ops.

Signed-off-by: default avatarG Kranthi <gudishax.kranthikumar@intel.com>
Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cb729d80

sound/soc/intel/skylake/skl-messages.c

+2 −6
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/skylake/skl-sst-ipc.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ struct skl_sst { 
	void (*update_d0i3c)(struct device *dev, bool enable);



	struct skl_d0i3_data d0i3;



	const struct skl_dsp_ops *dsp_ops;

};



struct skl_ipc_init_instance_msg {