aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-01-04 12:35:52 +0100
committerTakashi Iwai <tiwai@suse.de>2020-01-04 12:35:52 +0100
commit1bec13127023749d682ad0e2042a7bee87068a53 (patch)
tree8283011b985908974e852df7a1c7f8d6ece172c3
parent482cc83c0e34cf07fa0ff167aef12a03347399dc (diff)
downloadhda-emu-1bec13127023749d682ad0e2042a7bee87068a53.tar.gz
Fixes for the latest kernels
Add some essential typedefs, workqueue workaround, and the new control access flag definition for 5.6 kernel. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/linux/regmap.h1
-rw-r--r--include/sound/control.h2
-rw-r--r--include/sound/core.h2
-rw-r--r--include/wrapper.h7
4 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index cb5aec0..b0278f0 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -37,6 +37,7 @@ struct regmap_config {
bool use_single_rw;
bool use_single_read;
bool use_single_write;
+ bool disable_locking;
};
struct regmap *regmap_init(struct device *dev,
diff --git a/include/sound/control.h b/include/sound/control.h
index 1fe1ee8..4bfbd85 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -203,4 +203,6 @@ void snd_kctl_jack_report(struct snd_card *card,
#define snd_ctl_elem_read(card,ctl) 0
#define snd_ctl_elem_write(card,file,ctl) 0
+#define SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK 0
+
#endif /* __SOUND_CONTROL_H */
diff --git a/include/sound/core.h b/include/sound/core.h
index d7cf61e..99ace6d 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -90,7 +90,7 @@ struct snd_device_ops {
static inline
int snd_device_new(struct snd_card *card, snd_device_type_t type,
- void *device_data, struct snd_device_ops *ops)
+ void *device_data, const struct snd_device_ops *ops)
{
return 0;
}
diff --git a/include/wrapper.h b/include/wrapper.h
index 084ff53..f40cab7 100644
--- a/include/wrapper.h
+++ b/include/wrapper.h
@@ -339,4 +339,11 @@ module_exit(__driver##_exit);
#define cpu_relax()
#define wmb()
+typedef int wait_queue_head_t; // just a hack, no real meaning
+#define init_waitqueue_head(x) // we don't care for now
+
+typedef int irqreturn_t; // just a hack
+
+struct vm_area_struct;
+
#endif /* __HDA_WRAPPER_H */