ipq40xx: qca8k: use remove_new

Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch b/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
index 73e99f2bdc28c2d2c4205891a3ab34e2ab08b5b2..c0b926b7a19529afe048b358b15daee697cce983 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
+++ b/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
@@ -78,7 +78,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
                if (dsa_is_cpu_port(priv->ds, i))
 --- /dev/null
 +++ b/drivers/net/dsa/qca/qca8k-ipq4019.c
-@@ -0,0 +1,950 @@
+@@ -0,0 +1,948 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
@@ -990,14 +990,14 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +      return dsa_register_switch(priv->ds);
 +}
 +
-+static int
++static void
 +qca8k_ipq4019_remove(struct platform_device *pdev)
 +{
 +      struct qca8k_priv *priv = dev_get_drvdata(&pdev->dev);
 +      int i;
 +
 +      if (!priv)
-+              return 0;
++              return;
 +
 +      for (i = 0; i < QCA8K_IPQ4019_NUM_PORTS; i++)
 +              qca8k_port_set_status(priv, i, 0);
@@ -1005,8 +1005,6 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +      dsa_unregister_switch(priv->ds);
 +
 +      platform_set_drvdata(pdev, NULL);
-+
-+      return 0;
 +}
 +
 +static const struct of_device_id qca8k_ipq4019_of_match[] = {
@@ -1016,7 +1014,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +
 +static struct platform_driver qca8k_ipq4019_driver = {
 +      .probe = qca8k_ipq4019_probe,
-+      .remove = qca8k_ipq4019_remove,
++      .remove_new = qca8k_ipq4019_remove,
 +      .driver = {
 +              .name = "qca8k-ipq4019",
 +              .of_match_table = qca8k_ipq4019_of_match,