summaryrefslogtreecommitdiffstats
path: root/sound/x86/intel_hdmi_lpe_audio.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-30 16:37:06 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-03 17:21:41 +0100
commit9eca88c881f1c74c7f5dda3c67cb0b4178429e93 (patch)
tree03f63b60a1b3fbe50f2fd175fc299d51fc7bf725 /sound/x86/intel_hdmi_lpe_audio.h
parentf23df8071b178dcfa4f6014baf9323ddaa33e1fd (diff)
downloadlinux-9eca88c881f1c74c7f5dda3c67cb0b4178429e93.tar.bz2
ALSA: x86: Replace indirect query_ops with direct calls
Like the previous patch, this replaces the indirect query_ops calls via direct function calls. They are only get_caps and set_caps, so fairly straightforward at this time. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86/intel_hdmi_lpe_audio.h')
-rw-r--r--sound/x86/intel_hdmi_lpe_audio.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/sound/x86/intel_hdmi_lpe_audio.h b/sound/x86/intel_hdmi_lpe_audio.h
index ea90cf919948..5e925b728302 100644
--- a/sound/x86/intel_hdmi_lpe_audio.h
+++ b/sound/x86/intel_hdmi_lpe_audio.h
@@ -641,13 +641,6 @@ enum had_event_type {
typedef int (*had_event_call_back) (enum had_event_type event_type,
void *ctxt_info);
-struct hdmi_audio_query_set_ops {
- int (*hdmi_audio_get_caps)(enum had_caps_list query_element,
- void *capabilties);
- int (*hdmi_audio_set_caps)(enum had_caps_list set_element,
- void *capabilties);
-};
-
struct hdmi_audio_event {
int type;
};
@@ -663,9 +656,7 @@ bool mid_hdmi_audio_is_busy(void *dev);
bool mid_hdmi_audio_suspend(void *dev);
void mid_hdmi_audio_resume(void *dev);
void mid_hdmi_audio_signal_event(enum had_event_type event);
-int mid_hdmi_audio_setup(
- had_event_call_back audio_callbacks,
- struct hdmi_audio_query_set_ops *query_ops);
+int mid_hdmi_audio_setup(had_event_call_back audio_callbacks);
int mid_hdmi_audio_register(
struct snd_intel_had_interface *driver,
void *had_data);
@@ -674,4 +665,9 @@ int mid_hdmi_audio_read(u32 reg, u32 *val);
int mid_hdmi_audio_write(u32 reg, u32 val);
int mid_hdmi_audio_rmw(u32 reg, u32 val, u32 mask);
+int mid_hdmi_audio_get_caps(enum had_caps_list get_element,
+ void *capabilities);
+int mid_hdmi_audio_set_caps(enum had_caps_list set_element,
+ void *capabilties);
+
#endif