ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 22:23:27 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

generic: remove support for older kernels from swconfig

Browse Source 
The legacy swconfig switch driver framework supports kernels older than
Linux 6.6 by using #ifdef'ery with LINUX_VERSION_CODE. Remove all that.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2024-09-20 19:26:52 +01:00
parent 3660ddb8ab
commit 8181f09049
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@ -24,7 +24,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/switch.h> #include <linux/switch.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/version.h>
#include <uapi/linux/mii.h> #include <uapi/linux/mii.h>
#define SWCONFIG_DEVNAME "switch%d" #define SWCONFIG_DEVNAME "switch%d"
@ -1054,9 +1053,7 @@ static struct genl_family switch_fam = {
.module = THIS_MODULE, .module = THIS_MODULE,
.ops = swconfig_ops, .ops = swconfig_ops,
.n_ops = ARRAY_SIZE(swconfig_ops), .n_ops = ARRAY_SIZE(swconfig_ops),
#if LINUX_VERSION_CODE > KERNEL_VERSION(6,0,0)
.resv_start_op = SWITCH_CMD_SET_VLAN + 1, .resv_start_op = SWITCH_CMD_SET_VLAN + 1,
#endif
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF

16
target/linux/generic/files/drivers/net/phy/swconfig_leds.c
View File

@ -85,11 +85,7 @@ swconfig_trig_update_port_mask(struct led_trigger *trigger)
sw_trig = (void *) trigger; sw_trig = (void *) trigger;
port_mask = 0; port_mask = 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
spin_lock(&trigger->leddev_list_lock); spin_lock(&trigger->leddev_list_lock);
#else
read_lock(&trigger->leddev_list_lock);
#endif
list_for_each(entry, &trigger->led_cdevs) { list_for_each(entry, &trigger->led_cdevs) {
struct led_classdev *led_cdev; struct led_classdev *led_cdev;
struct swconfig_trig_data *trig_data; struct swconfig_trig_data *trig_data;
@ -102,11 +98,7 @@ swconfig_trig_update_port_mask(struct led_trigger *trigger)
read_unlock(&trig_data->lock); read_unlock(&trig_data->lock);
} }
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
spin_unlock(&trigger->leddev_list_lock); spin_unlock(&trigger->leddev_list_lock);
#else
read_unlock(&trigger->leddev_list_lock);
#endif
sw_trig->port_mask = port_mask; sw_trig->port_mask = port_mask;
@ -426,22 +418,14 @@ swconfig_trig_update_leds(struct switch_led_trigger *sw_trig)
struct led_trigger *trigger; struct led_trigger *trigger;
trigger = &sw_trig->trig; trigger = &sw_trig->trig;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
spin_lock(&trigger->leddev_list_lock); spin_lock(&trigger->leddev_list_lock);
#else
read_lock(&trigger->leddev_list_lock);
#endif
list_for_each(entry, &trigger->led_cdevs) { list_for_each(entry, &trigger->led_cdevs) {
struct led_classdev *led_cdev; struct led_classdev *led_cdev;
led_cdev = list_entry(entry, struct led_classdev, trig_list); led_cdev = list_entry(entry, struct led_classdev, trig_list);
swconfig_trig_led_event(sw_trig, led_cdev); swconfig_trig_led_event(sw_trig, led_cdev);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
spin_unlock(&trigger->leddev_list_lock); spin_unlock(&trigger->leddev_list_lock);
#else
read_unlock(&trigger->leddev_list_lock);
#endif
} }
static void static void