[nct6687d] patched for Linux 6.11

This commit is contained in:
Gwenhael Le Moine 2024-09-02 13:59:17 +02:00
parent 93bce15491
commit cb8c734e24
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 48 additions and 1 deletions

View file

@ -0,0 +1,41 @@
From 66c35797a515d14a6482fbb9da2f58b407083591 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Mon, 2 Sep 2024 13:35:20 +0200
Subject: [PATCH] fix compilation with kernel 6.11.0-rc6
---
nct6687.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/nct6687.c b/nct6687.c
index c23889f..de1fa4c 100644
--- a/nct6687.c
+++ b/nct6687.c
@@ -37,9 +37,6 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-
enum kinds
{
nct6683,
@@ -1034,7 +1031,7 @@ static void nct6687_setup_pwm(struct nct6687_data *data)
}
}
-static int nct6687_remove(struct platform_device *pdev)
+static void nct6687_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct nct6687_data *data = dev_get_drvdata(dev);
@@ -1048,8 +1045,6 @@ static int nct6687_remove(struct platform_device *pdev)
}
mutex_unlock(&data->update_lock);
-
- return 0;
}
static int nct6687_probe(struct platform_device *pdev)

View file

@ -12,6 +12,7 @@ PKG=$TMP/pkg-$PRGNAM
REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM
GITHUB_REPO=Fred78290/nct6687d
#GITHUB_REPO=gwenhael-le-moine/nct6687d
VERSION=${VERSION:-"trunk"}
KERNEL_VERSION=$(uname -r)
@ -29,7 +30,7 @@ mkdir -p "$PKG"
cd "$REPOSITORY" || exit 1
git pull --all
rm -fr "$PKG $TMP/$PRGNAM"
rm -fr "$PKG" "$TMP/$PRGNAM"
cp -R "$REPOSITORY" "$TMP/$PRGNAM"
cd "$TMP/$PRGNAM" || exit 1
@ -46,6 +47,11 @@ case $VERSION in
;;
esac
if [ -e "$CWD"/66c35797a515d14a6482fbb9da2f58b407083591.patch ]; then
patch -p1 < "$CWD"/66c35797a515d14a6482fbb9da2f58b407083591.patch
VERSION="${VERSION}_patched"
fi
# compilation
make