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

Commit 2559d992 authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

ASoC: Intel: move the driver context allocation to routine 



This will be used by ACPI code as well, so moving to common routine helps

Signed-off-by: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 54adc0ad

sound/soc/intel/sst/sst.c

+18 −5
Original line number Diff line number Diff line
@@ -230,6 +230,20 @@ static void sst_init_locks(struct intel_sst_drv *ctx) 
	spin_lock_init(&ctx->block_lock);

}



int sst_alloc_drv_context(struct intel_sst_drv **ctx,

		struct device *dev, unsigned int dev_id)

{

	*ctx = devm_kzalloc(dev, sizeof(struct intel_sst_drv), GFP_KERNEL);

	if (!(*ctx))

		return -ENOMEM;



	(*ctx)->dev = dev;

	(*ctx)->dev_id = dev_id;



	return 0;

}





/*

* intel_sst_probe - PCI probe function

*
@@ -247,12 +261,11 @@ static int intel_sst_probe(struct pci_dev *pci, 
	int ddr_base;



	dev_dbg(&pci->dev, "Probe for DID %x\n", pci->device);

	sst_drv_ctx = devm_kzalloc(&pci->dev, sizeof(*sst_drv_ctx), GFP_KERNEL);

	if (!sst_drv_ctx)

		return -ENOMEM;



	sst_drv_ctx->dev = &pci->dev;

	sst_drv_ctx->dev_id = pci->device;

	ret = sst_alloc_drv_context(&sst_drv_ctx, &pci->dev, pci->device);

	if (ret < 0)

		return ret;



	if (!sst_pdata)

		return -EINVAL;