Просмотр исходного кода

ipq40xx: ipqess: use remove_new

Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <[email protected]>
Rosen Penev 8 месяцев назад
Родитель
Сommit
538bbb0b71

+ 3 - 5
target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch

@@ -88,7 +88,7 @@ Signed-off-by: Maxime Chevallier <[email protected]>
 +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 <[email protected]>
@@ -1300,7 +1300,7 @@ Signed-off-by: Maxime Chevallier <[email protected]>
 +	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 <[email protected]>
 +
 +	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 <[email protected]>
 +		.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);