Commit 3b2a8582 authored by Simon Trimmer's avatar Simon Trimmer Committed by Takashi Iwai

ALSA: hda: hda_component: Move codec field into the parent

There is one codec shared across all of the bound HDA components and a
copy is usually stashed in the amp driver so it doesn't need to be in
every hda_component.
Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/20240617154105.108635-4-simont@opensource.cirrus.com
parent 1adf9101
...@@ -1436,10 +1436,11 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas ...@@ -1436,10 +1436,11 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
mutex_lock(&cs35l41->fw_mutex); mutex_lock(&cs35l41->fw_mutex);
comp->dev = dev; comp->dev = dev;
cs35l41->codec = parent->codec;
if (!cs35l41->acpi_subsystem_id) if (!cs35l41->acpi_subsystem_id)
cs35l41->acpi_subsystem_id = kasprintf(GFP_KERNEL, "%.8x", cs35l41->acpi_subsystem_id = kasprintf(GFP_KERNEL, "%.8x",
comp->codec->core.subsystem_id); cs35l41->codec->core.subsystem_id);
cs35l41->codec = comp->codec;
strscpy(comp->name, dev_name(dev), sizeof(comp->name)); strscpy(comp->name, dev_name(dev), sizeof(comp->name));
cs35l41->firmware_type = HDA_CS_DSP_FW_SPK_PROT; cs35l41->firmware_type = HDA_CS_DSP_FW_SPK_PROT;
...@@ -1470,7 +1471,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas ...@@ -1470,7 +1471,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
mutex_unlock(&cs35l41->fw_mutex); mutex_unlock(&cs35l41->fw_mutex);
sleep_flags = lock_system_sleep(); sleep_flags = lock_system_sleep();
if (!device_link_add(&comp->codec->core.dev, cs35l41->dev, DL_FLAG_STATELESS)) if (!device_link_add(&cs35l41->codec->core.dev, cs35l41->dev, DL_FLAG_STATELESS))
dev_warn(dev, "Unable to create device link\n"); dev_warn(dev, "Unable to create device link\n");
unlock_system_sleep(sleep_flags); unlock_system_sleep(sleep_flags);
......
...@@ -697,7 +697,7 @@ static int cs35l56_hda_bind(struct device *dev, struct device *master, void *mas ...@@ -697,7 +697,7 @@ static int cs35l56_hda_bind(struct device *dev, struct device *master, void *mas
return -EBUSY; return -EBUSY;
comp->dev = dev; comp->dev = dev;
cs35l56->codec = comp->codec; cs35l56->codec = parent->codec;
strscpy(comp->name, dev_name(dev), sizeof(comp->name)); strscpy(comp->name, dev_name(dev), sizeof(comp->name));
comp->playback_hook = cs35l56_hda_playback_hook; comp->playback_hook = cs35l56_hda_playback_hook;
......
...@@ -134,12 +134,9 @@ static int hda_comp_match_dev_name(struct device *dev, void *data) ...@@ -134,12 +134,9 @@ static int hda_comp_match_dev_name(struct device *dev, void *data)
int hda_component_manager_bind(struct hda_codec *cdc, int hda_component_manager_bind(struct hda_codec *cdc,
struct hda_component_parent *parent) struct hda_component_parent *parent)
{ {
int i;
/* Init shared and component specific data */ /* Init shared and component specific data */
memset(parent, 0, sizeof(*parent)); memset(parent, 0, sizeof(*parent));
for (i = 0; i < ARRAY_SIZE(parent->comps); i++) parent->codec = cdc;
parent->comps[i].codec = cdc;
return component_bind_all(hda_codec_dev(cdc), parent); return component_bind_all(hda_codec_dev(cdc), parent);
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
struct hda_component { struct hda_component {
struct device *dev; struct device *dev;
char name[HDA_MAX_NAME_SIZE]; char name[HDA_MAX_NAME_SIZE];
struct hda_codec *codec;
struct acpi_device *adev; struct acpi_device *adev;
bool acpi_notifications_supported; bool acpi_notifications_supported;
void (*acpi_notify)(acpi_handle handle, u32 event, struct device *dev); void (*acpi_notify)(acpi_handle handle, u32 event, struct device *dev);
...@@ -29,6 +28,7 @@ struct hda_component { ...@@ -29,6 +28,7 @@ struct hda_component {
}; };
struct hda_component_parent { struct hda_component_parent {
struct hda_codec *codec;
struct hda_component comps[HDA_MAX_COMPONENTS]; struct hda_component comps[HDA_MAX_COMPONENTS];
}; };
......
...@@ -719,7 +719,7 @@ static int tas2781_hda_bind(struct device *dev, struct device *master, ...@@ -719,7 +719,7 @@ static int tas2781_hda_bind(struct device *dev, struct device *master,
if (comp->dev) if (comp->dev)
return -EBUSY; return -EBUSY;
codec = comp->codec; codec = parent->codec;
subid = codec->core.subsystem_id >> 16; subid = codec->core.subsystem_id >> 16;
switch (subid) { switch (subid) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment