kellen/gasket-driver
1
0
Fork 0
forked from MIrrors/gasket-driver
Code Pull Requests Actions Packages Activity

Amend use of class_create() for kernels >= 6.4

Browse Source 
The function signature for `class_create()` was changed in kernels >= 6.4.x to only accept a single argument (see kernel commit #dcfbb67).

This change will conditionally modify how `class_create()` is called depending on the kernel version.
This commit is contained in:
Chris Bradbury
2023-07-14 18:55:56 +01:00
committed by Michael Brooks
parent 97aeba584e
commit 8aca235839
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gasket_core.c
View File

@@ -27,6 +27,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/version.h>
#ifdef GASKET_KERNEL_TRACE_SUPPORT #ifdef GASKET_KERNEL_TRACE_SUPPORT
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
@@ -1837,8 +1838,15 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)
internal = &g_descs[desc_idx]; internal = &g_descs[desc_idx];
mutex_init(&internal->mutex); mutex_init(&internal->mutex);
memset(internal->devs, 0, sizeof(struct gasket_dev *) * GASKET_DEV_MAX); memset(internal->devs, 0, sizeof(struct gasket_dev *) * GASKET_DEV_MAX);
internal->class =
class_create(driver_desc->module, driver_desc->name); /* Function signature for `class_create()` is changed in kernel >= 6.4.x
* to only accept a single argument.
* */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
internal->class = class_create(driver_desc->module, driver_desc->name);
#else
internal->class = class_create(driver_desc->name);
#endif
if (IS_ERR(internal->class)) { if (IS_ERR(internal->class)) {
pr_err("Cannot register %s class [ret=%ld]\n", pr_err("Cannot register %s class [ret=%ld]\n",