diff -pruN 0.4.1-3/ddcci/ddcci.c 0.4.2-3/ddcci/ddcci.c
--- 0.4.1-3/ddcci/ddcci.c 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/ddcci/ddcci.c 2021-11-30 22:03:10.000000000 +0000
@@ -1281,6 +1281,13 @@ static int ddcci_device_remove(struct de
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
*/
@@ -1288,7 +1295,11 @@ 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, "inter
/* 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");
diff -pruN 0.4.1-3/ddcci/Makefile 0.4.2-3/ddcci/Makefile
--- 0.4.1-3/ddcci/Makefile 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/ddcci/Makefile 2021-11-30 22:03:10.000000000 +0000
@@ -16,7 +16,7 @@
# along with ddcci-driver-linux. If not, see .
MODULE_NAME := ddcci
-MODULE_VERSION := 0.4.1
+MODULE_VERSION := 0.4.2
KVER := $(shell uname -r)
LIB_MODULES_PATH := /lib/modules
diff -pruN 0.4.1-3/ddcci-backlight/ddcci-backlight.c 0.4.2-3/ddcci-backlight/ddcci-backlight.c
--- 0.4.1-3/ddcci-backlight/ddcci-backlight.c 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/ddcci-backlight/ddcci-backlight.c 2021-11-30 22:03:10.000000000 +0000
@@ -407,7 +407,7 @@ MODULE_PARM_DESC(convenience_symlink, "a
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-*-*-*-*");
diff -pruN 0.4.1-3/ddcci-backlight/Makefile 0.4.2-3/ddcci-backlight/Makefile
--- 0.4.1-3/ddcci-backlight/Makefile 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/ddcci-backlight/Makefile 2021-11-30 22:03:10.000000000 +0000
@@ -16,7 +16,7 @@
# along with ddcci-driver-linux. If not, see .
MODULE_NAME := ddcci-backlight
-MODULE_VERSION := 0.4.1
+MODULE_VERSION := 0.4.2
KVER := $(shell uname -r)
LIB_MODULES_PATH := /lib/modules
diff -pruN 0.4.1-3/debian/changelog 0.4.2-3/debian/changelog
--- 0.4.1-3/debian/changelog 2021-11-24 14:44:06.000000000 +0000
+++ 0.4.2-3/debian/changelog 2022-06-22 11:27:20.000000000 +0000
@@ -1,3 +1,26 @@
+ddcci-driver-linux (0.4.2-3) unstable; urgency=medium
+
+ * Skip the build if CONFIG_I2C is disabled.
+
+ -- Stephen Kitt Wed, 22 Jun 2022 13:27:20 +0200
+
+ddcci-driver-linux (0.4.2-2) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * Switch to dh-sequence-dkms.
+ * Declare Testsuite: autopkgtest-pkg-dkms.
+
+ [ Stephen Kitt ]
+ * Standards-Version 4.6.1, no change required.
+
+ -- Stephen Kitt Sun, 05 Jun 2022 20:52:01 +0200
+
+ddcci-driver-linux (0.4.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Stephen Kitt Sat, 04 Dec 2021 09:42:38 +0100
+
ddcci-driver-linux (0.4.1-3) unstable; urgency=medium
* Handle all returns in the 5.15 patch. Really closes: #1000357.
diff -pruN 0.4.1-3/debian/control 0.4.2-3/debian/control
--- 0.4.1-3/debian/control 2021-09-01 15:28:59.000000000 +0000
+++ 0.4.2-3/debian/control 2022-06-05 18:50:46.000000000 +0000
@@ -3,12 +3,13 @@ Maintainer: Stephen Kitt
-
-bus_type.remove was changed to expect a function returning void in
-5.15, with commit fc7a6209d571 ("bus: Make remove callback return
-void").
-
---- a/ddcci/ddcci.c
-+++ b/ddcci/ddcci.c
-@@ -1269,20 +1269,30 @@
- return ret;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- static int ddcci_device_remove(struct device *dev)
-+#else
-+static void ddcci_device_remove(struct device *dev)
-+#endif
- {
- struct ddcci_device *device = ddcci_verify_device(dev);
- struct ddcci_driver *driver;
- int ret = 0;
-
- if (!device)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- return -EINVAL;
-+#else
-+ return;
-+#endif
- driver = to_ddcci_driver(dev->driver);
-
- if (driver->remove)
- ret = driver->remove(device);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- return ret;
-+#endif
- }
-
- /**
diff -pruN 0.4.1-3/debian/patches/series 0.4.2-3/debian/patches/series
--- 0.4.1-3/debian/patches/series 2021-11-22 10:24:15.000000000 +0000
+++ 0.4.2-3/debian/patches/series 2022-06-22 11:24:19.000000000 +0000
@@ -1,3 +1,3 @@
0002-Skip-build-if-BACKLIGHT_CLASS_DEVICE-off.patch
pre-5.1-static_assert.patch
-kernel-5.15-void-remove.patch
+skip-if-no-config-i2c.patch
diff -pruN 0.4.1-3/debian/patches/skip-if-no-config-i2c.patch 0.4.2-3/debian/patches/skip-if-no-config-i2c.patch
--- 0.4.1-3/debian/patches/skip-if-no-config-i2c.patch 1970-01-01 00:00:00.000000000 +0000
+++ 0.4.2-3/debian/patches/skip-if-no-config-i2c.patch 2022-06-22 11:25:28.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Skip the build if CONFIG_I2C is disabled
+Author: Stephen Kitt
+
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -14,3 +14,8 @@
+ echo "BACKLIGHT_CLASS_DEVICE disabled in this kernel, not building module." >&2
+ BUILD_EXCLUSIVE_ARCH="^do_not_build$"
+ fi
++# Don't build module when I2C is disabled
++if ! grep -q "^CONFIG_I2C=[ym]$" "$kernel_source_dir/.config" 2>/dev/null ; then
++ echo "I2C disabled in this kernel, not building module." >&2
++ BUILD_EXCLUSIVE_ARCH="^do_not_build$"
++fi
diff -pruN 0.4.1-3/debian/rules 0.4.2-3/debian/rules
--- 0.4.1-3/debian/rules 2021-09-01 14:28:29.000000000 +0000
+++ 0.4.2-3/debian/rules 2022-06-05 18:49:58.000000000 +0000
@@ -5,7 +5,7 @@ PACKAGE_VERSION=$(shell grep PACKAGE_VER
export PACKAGE_NAME PACKAGE_VERSION
%:
- dh $@ --with dkms
+ dh $@
# Nothing to configure, build or auto-install (this all happens after
# installation using dkms)
diff -pruN 0.4.1-3/dkms.conf 0.4.2-3/dkms.conf
--- 0.4.1-3/dkms.conf 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/dkms.conf 2021-11-30 22:03:10.000000000 +0000
@@ -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"
diff -pruN 0.4.1-3/Makefile.dkms 0.4.2-3/Makefile.dkms
--- 0.4.1-3/Makefile.dkms 2021-08-17 11:56:55.000000000 +0000
+++ 0.4.2-3/Makefile.dkms 2021-11-30 22:03:10.000000000 +0000
@@ -16,7 +16,7 @@
# along with ddcci-driver-linux. If not, see .
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: