Kernel 5.8 compatibility for ioread32

`unsigned int ioread32(void __iomem *)` became `unsigned int ioread32(const void __iomem *)` in kernel 5.8 and above. Changed struct fa_memory_ops accordingly. Added missing include for linux/io.h Signed-off-by: Gwenhael GOAVEC <gwenhael.goavec@femto-st.fr> Signed-off-by: Mathis MARION <mathis.marion@grenoble-inp.org>

Kernel 5.8 compatibility for ioread32
`unsigned int ioread32(void __iomem *)` became `unsigned int ioread32(const void __iomem *)` in kernel 5.8 and above. Changed struct fa_memory_ops accordingly. Added missing include for linux/io.h Signed-off-by: Gwenhael GOAVEC <gwenhael.goavec@femto-st.fr> Signed-off-by: Mathis MARION <mathis.marion@grenoble-inp.org>
d47bbfdc · Mathis MARION · Federico Vaga · 24452ec0 · d47bbfdc · d47bbfdc
Commit d47bbfdc authored Jul 12, 2021 by Mathis MARION Committed by Federico Vaga Aug 31, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

fa-core.c software/kernel/fa-core.c +1 -0

fmc-adc-100m14b4cha-private.h software/kernel/fmc-adc-100m14b4cha-private.h +5 -0

No files found.
--- a/software/kernel/fa-core.c
+++ b/software/kernel/fa-core.c
@@ -12,6 +12,7 @@
 #include <linux/mod_devicetable.h>
 #include <uapi/linux/ipmi/fru.h>
 #include <linux/fmc.h>
+#include <linux/io.h>

 #include "fmc-adc-100m14b4cha-private.h"
 #include <platform_data/fmc-adc-100m14b4cha.h>

--- a/software/kernel/fmc-adc-100m14b4cha-private.h
+++ b/software/kernel/fmc-adc-100m14b4cha-private.h
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/fmc.h>
 #include <linux/completion.h>
+#include <linux/version.h>

 #include <linux/zio.h>
 #include <linux/zio-dma.h>
@@ -64,7 +65,11 @@ enum fa_bus_resource {
 };

 struct fa_memory_ops {
+#if KERNEL_VERSION(5, 8, 0) <= LINUX_VERSION_CODE
+	u32 (*read)(const void *addr);
+#else
 	u32 (*read)(void *addr);
+#endif
 	void (*write)(u32 value, void *addr);
 };