kevin/linux
1
Fork 0
Code

ALSA: hda: hda_component: Initialize shared data during bind callback

Browse Source 
Move the initialization of the shared struct hda_component array into
hda_component_manager_bind().

The purpose of the manager bind() callback is to allow it to perform
initialization before binding in the component drivers. This is the
correct place to initialize the shared data.

The original implementation initialized the shared data in
hda_component_manager_init(). This is only done once during probe()
of the manager driver. So if the component binding was unbound and
then rebound, the shared data would not be re-initialized.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: fd895a74dc ("ALSA: hda: realtek: Move hda_component implementation to module")
Link: https://lore.kernel.org/r/20240508100347.47283-1-rf@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Richard Fitzgerald 2024-05-08 11:03:47 +01:00 committed by Takashi Iwai
parent 172811e3a5
commit ec6f32bc92
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/hda/hda_component.c
View File

@ -123,6 +123,21 @@ static int hda_comp_match_dev_name(struct device *dev, void *data)
return !strcmp(d + n, tmp); return !strcmp(d + n, tmp);
} }
int hda_component_manager_bind(struct hda_codec *cdc,
struct hda_component *comps, int count)
{
int i;
/* Init shared data */
for (i = 0; i < count; ++i) {
memset(&comps[i], 0, sizeof(comps[i]));
comps[i].codec = cdc;
}
return component_bind_all(hda_codec_dev(cdc), comps);
}
EXPORT_SYMBOL_NS_GPL(hda_component_manager_bind, SND_HDA_SCODEC_COMPONENT);
int hda_component_manager_init(struct hda_codec *cdc, int hda_component_manager_init(struct hda_codec *cdc,
struct hda_component *comps, int count, struct hda_component *comps, int count,
const char *bus, const char *hid, const char *bus, const char *hid,
@ -143,7 +158,6 @@ int hda_component_manager_init(struct hda_codec *cdc,
sm->hid = hid; sm->hid = hid;
sm->match_str = match_str; sm->match_str = match_str;
sm->index = i; sm->index = i;
comps[i].codec = cdc;
component_match_add(dev, &match, hda_comp_match_dev_name, sm); component_match_add(dev, &match, hda_comp_match_dev_name, sm);
} }

7
sound/pci/hda/hda_component.h
View File

@ -75,11 +75,8 @@ int hda_component_manager_init(struct hda_codec *cdc,
void hda_component_manager_free(struct hda_codec *cdc, void hda_component_manager_free(struct hda_codec *cdc,
const struct component_master_ops *ops); const struct component_master_ops *ops);
static inline int hda_component_manager_bind(struct hda_codec *cdc, int hda_component_manager_bind(struct hda_codec *cdc,
struct hda_component *comps) struct hda_component *comps, int count);
{
return component_bind_all(hda_codec_dev(cdc), comps);
}
static inline void hda_component_manager_unbind(struct hda_codec *cdc, static inline void hda_component_manager_unbind(struct hda_codec *cdc,
struct hda_component *comps) struct hda_component *comps)

2
sound/pci/hda/patch_realtek.c
View File

@ -6785,7 +6785,7 @@ static int comp_bind(struct device *dev)
struct alc_spec *spec = cdc->spec; struct alc_spec *spec = cdc->spec;
int ret; int ret;
ret = hda_component_manager_bind(cdc, spec->comps); ret = hda_component_manager_bind(cdc, spec->comps, ARRAY_SIZE(spec->comps));
if (ret) if (ret)
return ret; return ret;