[openwrt/openwrt] package: kernel: leds-gca230718: fix build with Linux 6.6

LEDE Commits lede-commits at lists.infradead.org
Thu Apr 11 18:08:48 PDT 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/07918e6612633d550197512a1b15c72867ef80e3

commit 07918e6612633d550197512a1b15c72867ef80e3
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Apr 12 02:02:36 2024 +0100

    package: kernel: leds-gca230718: fix build with Linux 6.6
    
    Starting with Linux 6.3 the .probe call no longer got the id parameter,
    see also commit torvalds/linux at 03c835f498b5
    ("i2c: Switch .probe() to not take an id parameter").
    
    As the parameter is anyway unused by the driver, drop it when
    building the GCA230718 LED driver for newer kernels.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/kernel/leds-gca230718/src/leds-gca230718.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/kernel/leds-gca230718/src/leds-gca230718.c b/package/kernel/leds-gca230718/src/leds-gca230718.c
index d759453cd9..194d149970 100644
--- a/package/kernel/leds-gca230718/src/leds-gca230718.c
+++ b/package/kernel/leds-gca230718/src/leds-gca230718.c
@@ -109,7 +109,11 @@ static int gca230718_set_brightness(struct led_classdev *led_cdev, enum led_brig
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
+static int gca230718_probe(struct i2c_client *client)
+#else
 static int gca230718_probe(struct i2c_client *client, const struct i2c_device_id *id)
+#endif
 {
 	int status = 0;
 	struct gca230718_private* gca230718_privateData;




More information about the lede-commits mailing list