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

Commit 6298542f authored by Rakesh Ughreja's avatar Rakesh Ughreja Committed by Takashi Iwai
Browse files

ALSA: hdac: remove memory allocation from snd_hdac_ext_bus_device_init 



Remove memory allocation within snd_hdac_ext_bus_device_init, to make
its behaviour identical to snd_hdac_bus_device_init. So that caller
can allocate the parent data structure containing hdac_device.
This API change helps in reusing the legacy HDA codec drivers with
ASoC platform drivers.

Signed-off-by: default avatarRakesh Ughreja <rakesh.a.ughreja@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 24494d3f

include/sound/hdaudio_ext.h

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev, 
		      const struct hdac_io_ops *io_ops);



void snd_hdac_ext_bus_exit(struct hdac_bus *bus);

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr);

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,

						struct hdac_device *hdev);

void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev);

void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus);

sound/hda/ext/hdac_ext_bus.c

+2 −6
Original line number Diff line number Diff line
@@ -135,16 +135,12 @@ static void default_release(struct device *dev) 
 *

 * Returns zero for success or a negative error code.

 */

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr)

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,

					struct hdac_device *hdev)

{

	struct hdac_device *hdev = NULL;

	char name[15];

	int ret;



	hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);

	if (!hdev)

		return -ENOMEM;



	hdev->bus = bus;



	snprintf(name, sizeof(name), "ehdaudio%dD%d", bus->idx, addr);

sound/soc/intel/skylake/skl.c

+7 −1
Original line number Diff line number Diff line
@@ -635,6 +635,8 @@ static int probe_codec(struct hdac_bus *bus, int addr) 
	unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |

		(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;

	unsigned int res = -1;

	struct skl *skl = bus_to_skl(bus);

	struct hdac_device *hdev;



	mutex_lock(&bus->cmd_mutex);

	snd_hdac_bus_send_cmd(bus, cmd);
@@ -644,7 +646,11 @@ static int probe_codec(struct hdac_bus *bus, int addr) 
		return -EIO;

	dev_dbg(bus->dev, "codec #%d probed OK\n", addr);



	return snd_hdac_ext_bus_device_init(bus, addr);

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

	if (!hdev)

		return -ENOMEM;



	return snd_hdac_ext_bus_device_init(bus, addr, hdev);

}



/* Codec initialization */