36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From 6df7338351c342060088aa9abd561b81ccc113d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||
|
|
Date: Sun, 15 Sep 2024 19:05:46 +0000
|
||
|
|
Subject: vhba: Fix compat with kernel 6.11
|
||
|
|
|
||
|
|
Upstream commit 0edb555a65d1ef047a9805051c36922b52a38a9d changed the
|
||
|
|
return value of the `remove` callback from `int` to `void`.
|
||
|
|
---
|
||
|
|
drivers/scsi/vhba/vhba.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
--- a/drivers/scsi/vhba/vhba.c
|
||
|
|
+++ b/drivers/scsi/vhba/vhba.c
|
||
|
|
@@ -1049,7 +1049,11 @@ static int vhba_probe (struct platform_d
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
|
||
|
|
static int vhba_remove (struct platform_device *pdev)
|
||
|
|
+#else
|
||
|
|
+static void vhba_remove (struct platform_device *pdev)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
struct vhba_host *vhost;
|
||
|
|
struct Scsi_Host *shost;
|
||
|
|
@@ -1062,7 +1066,9 @@ static int vhba_remove (struct platform_
|
||
|
|
|
||
|
|
kfree(vhost->commands);
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
|
||
|
|
return 0;
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
static void vhba_release (struct device * dev)
|