From 538bbb0b719b237c322c0946bab965e52f2c208d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Apr 2025 15:51:18 -0700 Subject: [PATCH] ipq40xx: ipqess: use remove_new Easy compability fix for kernel 6.12. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18660 Signed-off-by: Christian Marangi --- ...-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch b/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch index b8557bacc75..3303cfed1da 100644 --- a/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch +++ b/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch @@ -88,7 +88,7 @@ Signed-off-by: Maxime Chevallier +ipq_ess-objs := ipqess.o ipqess_ethtool.o --- /dev/null +++ b/drivers/net/ethernet/qualcomm/ipqess/ipqess.c -@@ -0,0 +1,1251 @@ +@@ -0,0 +1,1249 @@ +// SPDX-License-Identifier: GPL-2.0 OR ISC +/* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2017 - 2018, John Crispin @@ -1300,7 +1300,7 @@ Signed-off-by: Maxime Chevallier + return err; +} + -+static int ipqess_axi_remove(struct platform_device *pdev) ++static void ipqess_axi_remove(struct platform_device *pdev) +{ + const struct net_device *netdev = platform_get_drvdata(pdev); + struct ipqess *ess = netdev_priv(netdev); @@ -1313,8 +1313,6 @@ Signed-off-by: Maxime Chevallier + + phylink_destroy(ess->phylink); + clk_disable_unprepare(ess->ess_clk); -+ -+ return 0; +} + +static const struct of_device_id ipqess_of_mtable[] = { @@ -1329,7 +1327,7 @@ Signed-off-by: Maxime Chevallier + .of_match_table = ipqess_of_mtable, + }, + .probe = ipqess_axi_probe, -+ .remove = ipqess_axi_remove, ++ .remove_new = ipqess_axi_remove, +}; + +module_platform_driver(ipqess_axi_driver);