hdmi_audio: fix GCC compilation issues with inline functions

remove inlining to avoid errors reported by GCC 6
emutex · Sep 13, 2017 · 991f580 · 991f580
1 parent 1288e5d
commit 991f580
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/sound/hdmi_audio/intel_mid_hdmi_audio.c b/sound/hdmi_audio/intel_mid_hdmi_audio.c
@@ -197,7 +197,7 @@ static const struct snd_pcm_hardware snd_intel_hadstream = {
 
 /* Register access functions */
 
-inline int had_get_hwstate(struct snd_intelhad *intelhaddata)
+int had_get_hwstate(struct snd_intelhad *intelhaddata)
 {
 	/* Check for device presence -SW state */
 	if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {
@@ -220,7 +220,7 @@ inline int had_get_hwstate(struct snd_intelhad *intelhaddata)
 	return 0;
 }
 
-inline int had_get_caps(enum had_caps_list query, void *caps)
+int had_get_caps(enum had_caps_list query, void *caps)
 {
 	int retval;
 	struct snd_intelhad *intelhaddata = had_data;
@@ -233,7 +233,7 @@ inline int had_get_caps(enum had_caps_list query, void *caps)
 	return retval;
 }
 
-inline int had_set_caps(enum had_caps_list set_element, void *caps)
+int had_set_caps(enum had_caps_list set_element, void *caps)
 {
 	int retval;
 	struct snd_intelhad *intelhaddata = had_data;
@@ -246,7 +246,7 @@ inline int had_set_caps(enum had_caps_list set_element, void *caps)
 	return retval;
 }
 
-inline int had_read_register(uint32_t offset, uint32_t *data)
+int had_read_register(uint32_t offset, uint32_t *data)
 {
 	int retval;
 	struct snd_intelhad *intelhaddata = had_data;
@@ -260,7 +260,7 @@ inline int had_read_register(uint32_t offset, uint32_t *data)
 	return retval;
 }
 
-inline int had_write_register(uint32_t offset, uint32_t data)
+int had_write_register(uint32_t offset, uint32_t data)
 {
 	int retval;
 	struct snd_intelhad *intelhaddata = had_data;
@@ -274,7 +274,7 @@ inline int had_write_register(uint32_t offset, uint32_t data)
 	return retval;
 }
 
-inline int had_read_modify(uint32_t offset, uint32_t data, uint32_t mask)
+int had_read_modify(uint32_t offset, uint32_t data, uint32_t mask)
 {
 	int retval;
 	struct snd_intelhad *intelhaddata = had_data;

diff --git a/sound/hdmi_audio/intel_mid_hdmi_audio.h b/sound/hdmi_audio/intel_mid_hdmi_audio.h
@@ -727,14 +727,14 @@ int snd_intelhad_init_audio_ctrl(struct snd_pcm_substream *substream,
 int snd_intelhad_prog_buffer(struct snd_intelhad *intelhaddata,
 					int start, int end);
 int snd_intelhad_invd_buffer(int start, int end);
-inline int snd_intelhad_read_len(struct snd_intelhad *intelhaddata);
+int snd_intelhad_read_len(struct snd_intelhad *intelhaddata);
 void had_build_channel_allocation_map(struct snd_intelhad *intelhaddata);
 
 /* Register access functions */
-inline int had_get_hwstate(struct snd_intelhad *intelhaddata);
-inline int had_get_caps(enum had_caps_list query_element, void *capabilties);
-inline int had_set_caps(enum had_caps_list set_element, void *capabilties);
-inline int had_read_register(uint32_t reg_addr, uint32_t *data);
-inline int had_write_register(uint32_t reg_addr, uint32_t data);
-inline int had_read_modify(uint32_t reg_addr, uint32_t data, uint32_t mask);
+int had_get_hwstate(struct snd_intelhad *intelhaddata);
+int had_get_caps(enum had_caps_list query_element, void *capabilties);
+int had_set_caps(enum had_caps_list set_element, void *capabilties);
+int had_read_register(uint32_t reg_addr, uint32_t *data);
+int had_write_register(uint32_t reg_addr, uint32_t data);
+int had_read_modify(uint32_t reg_addr, uint32_t data, uint32_t mask);
 #endif