Merge branch 'master' into 'master'

Fix build for Linux 5.15 and bump version

Closes torvalds#25

See merge request ddcci-driver-linux/ddcci-driver-linux!8

Makefile.dkms

@@ -16,7 +16,7 @@
 # along with ddcci-driver-linux.  If not, see <http://www.gnu.org/licenses/>.
 
 PACKAGE_NAME := ddcci
-PACKAGE_VERSION := 0.4.1
+PACKAGE_VERSION := 0.4.2
 
 install:
 	dkms add .
@@ -28,7 +28,7 @@ uninstall:
 	rm -r /usr/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION) || true
 
 load:
-	@test -n "$$(dkms status ddcci/0.4.1)" || { echo 'Please run `make -f Makefile.dkms install` first.'; false; }
+	@test -n "$$(dkms status ddcci/0.4.2)" || { echo 'Please run `make -f Makefile.dkms install` first.'; false; }
 	modprobe ddcci
 
 unload:

ddcci-backlight/Makefile

@@ -16,7 +16,7 @@
 # along with ddcci-driver-linux.  If not, see <http://www.gnu.org/licenses/>.
 
 MODULE_NAME := ddcci-backlight
-MODULE_VERSION := 0.4.1
+MODULE_VERSION := 0.4.2
 
 KVER := $(shell uname -r)
 LIB_MODULES_PATH := /lib/modules

ddcci-backlight/ddcci-backlight.c

@@ -407,7 +407,7 @@ MODULE_PARM_DESC(convenience_symlink, "add convenience symlink \"ddcci_backlight
 
 MODULE_AUTHOR("Christoph Grenz");
 MODULE_DESCRIPTION("DDC/CI generic monitor backlight driver");
-MODULE_VERSION("0.4.1");
+MODULE_VERSION("0.4.2");
 MODULE_LICENSE("GPL");
 
 MODULE_ALIAS("ddcci:monitor-*-*-*-*");

ddcci/Makefile

@@ -16,7 +16,7 @@
 # along with ddcci-driver-linux.  If not, see <http://www.gnu.org/licenses/>.
 
 MODULE_NAME := ddcci
-MODULE_VERSION := 0.4.1
+MODULE_VERSION := 0.4.2
 
 KVER := $(shell uname -r)
 LIB_MODULES_PATH := /lib/modules

ddcci/ddcci.c

@@ -1281,14 +1281,25 @@ static int ddcci_device_remove(struct device *dev)
 	return ret;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+static void ddcci_device_remove_void(struct device *dev)
+{
+	ddcci_device_remove(dev);
+}
+#endif
+
 /**
  * DDCCI bus type structure
  */
 struct bus_type ddcci_bus_type = {
 	.name		= "ddcci",
 	.match		= ddcci_device_match,
 	.probe		= ddcci_device_probe,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+	.remove		= ddcci_device_remove_void
+#else
 	.remove		= ddcci_device_remove
+#endif
 };
 
 /* Main I2C driver */
@@ -1880,5 +1891,5 @@ MODULE_PARM_DESC(autoprobe_addrs, "internal dependent device addresses to autopr
 /* Module description */
 MODULE_AUTHOR("Christoph Grenz");
 MODULE_DESCRIPTION("DDC/CI bus driver");
-MODULE_VERSION("0.4.1");
+MODULE_VERSION("0.4.2");
 MODULE_LICENSE("GPL");

dkms.conf

@@ -1,4 +1,4 @@
-PACKAGE_VERSION="0.4.1"
+PACKAGE_VERSION="0.4.2"
 PACKAGE_NAME="ddcci"
 CLEAN="make clean"
 BUILT_MODULE_NAME[0]="ddcci"