From de9efb77700b2cd055f8f4dd49827d1ee34fc093 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Mon, 6 Jan 2025 14:47:09 +0100 Subject: [PATCH] Fix ccat for aarch64 >= 6.11.0 return type of platform_driver::remove was changed to void --- devices/ccat/module.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/devices/ccat/module.c b/devices/ccat/module.c index 1294480c..84ff3545 100644 --- a/devices/ccat/module.c +++ b/devices/ccat/module.c @@ -398,7 +398,11 @@ static int ccat_eim_probe(struct platform_device *pdev) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,11,0) +static void ccat_eim_remove(struct platform_device *pdev) +#else static int ccat_eim_remove(struct platform_device *pdev) +#endif { struct ccat_device *ccatdev = platform_get_drvdata(pdev); @@ -407,7 +411,9 @@ static int ccat_eim_remove(struct platform_device *pdev) iounmap(ccatdev->bar_0); release_mem_region(0xf0000000, 0x02000000); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static const struct of_device_id bhf_eim_ccat_ids[] = {