Revert "ALSA: hda: convert audio_component member of hdac_bus to void pointer"

ujfalusi · ujfalusi · commit f3da5141547b · 2025-07-03T11:47:13.000+03:00
This reverts commit aa07f95. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
@@ -366,7 +366,7 @@ struct hdac_bus {
 	struct mutex lock;
 
 	/* DRM component interface */
-	void *audio_component;
+	struct drm_audio_component *audio_component;
 	long display_power_status;
 	unsigned long display_power_active;
 
diff --git a/sound/hda/hdac_component.c b/sound/hda/hdac_component.c
@@ -252,12 +252,10 @@ static const struct component_master_ops hdac_component_master_ops = {
 int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,
 				    const struct drm_audio_component_audio_ops *aops)
 {
-	struct drm_audio_component *acomp = bus->audio_component;
-
-	if (!acomp)
+	if (!bus->audio_component)
 		return -ENODEV;
 
-	acomp->audio_ops = aops;
+	bus->audio_component->audio_ops = aops;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier);

Original file line number	Diff line number	Diff line change
`@@ -252,12 +252,10 @@ static const struct component_master_ops hdac_component_master_ops = {`
`252`	`252`	`int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,`
`253`	`253`	`const struct drm_audio_component_audio_ops *aops)`
`254`	`254`	`{`
`255`		`- struct drm_audio_component *acomp = bus->audio_component;`
`256`		`-`
`257`		`- if (!acomp)`
	`255`	`+ if (!bus->audio_component)`
`258`	`256`	`return -ENODEV;`
`259`	`257`
`260`		`- acomp->audio_ops = aops;`
	`258`	`+ bus->audio_component->audio_ops = aops;`
`261`	`259`	`return 0;`
`262`	`260`	`}`
`263`	`261`	`EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier);`