kernel: update drivers to be compatible with kernel 6.12

Update drivers to be compatible with kernel 6.12.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>

diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
index 029142ca618abdd219187679f2dc7e08821da2ce..0e165f28c4f73792cb592937f6f0f0739bd7c1f2 100644 (file)
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
@@ -1452,7 +1452,11 @@ err_free_buf:
        return ret;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int ar934x_nfc_remove(struct platform_device *pdev)
+#else
+static void ar934x_nfc_remove(struct platform_device *pdev)
+#endif
 {
        struct ar934x_nfc *nfc;
 
@@ -1463,7 +1467,9 @@ static int ar934x_nfc_remove(struct platform_device *pdev)
                ar934x_nfc_free_buf(nfc);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id ar934x_nfc_match[] = {

diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
index e42631525c4b56dad37bc159ccd9ff2e9d62a288..8eebf3047da38fa7b9ad088c853942d20e8f6cc6 100644 (file)
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
@@ -214,14 +214,20 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rb4xx_nand_remove(struct platform_device *pdev)
+#else
+static void rb4xx_nand_remove(struct platform_device *pdev)
+#endif
 {
        struct rb4xx_nand *nand = platform_get_drvdata(pdev);
 
        mtd_device_unregister(nand_to_mtd(&nand->chip));
        nand_cleanup(&nand->chip);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct platform_device_id rb4xx_nand_id_table[] = {

diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c b/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c
index cf2809bfa36678a8a5271b4628050f4a05dc179a..5502e0d3794fadb6f4f3e184b13c123050be154b 100644 (file)
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c
@@ -335,13 +335,19 @@ static int rb91x_nand_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rb91x_nand_remove(struct platform_device *pdev)
+#else
+static void rb91x_nand_remove(struct platform_device *pdev)
+#endif
 {
        struct rb91x_nand_drvdata *drvdata = platform_get_drvdata(pdev);
 
        rb91x_nand_release(drvdata);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id rb91x_nand_match[] = {

diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_legacy_mdio.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_legacy_mdio.c
index fda561a37431646b979894476e432503b30c2179..3f1efca9c4d2cb4eb3f0fa6dad3ce52f50d890c6 100644 (file)
--- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_legacy_mdio.c
+++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_legacy_mdio.c
@@ -13,6 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/of_mdio.h>
+#include <linux/version.h>
 #include "ag71xx.h"
 
 #define AG71XX_MDIO_RETRY      1000
@@ -221,12 +222,18 @@ static int ag71xx_mdio_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int ag71xx_mdio_remove(struct platform_device *pdev)
+#else
+static void ag71xx_mdio_remove(struct platform_device *pdev)
+#endif
 {
        struct ag71xx_mdio *am = platform_get_drvdata(pdev);
 
        mdiobus_unregister(am->mii_bus);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id ag71xx_mdio_match[] = {

diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index c6fcea1abdac1fc36f07db6a82476934dab5de35..3e013d5ec71f457e62eb45b7c967f9b849871693 100644 (file)
--- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -15,6 +15,7 @@
 #include <linux/of_net.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/version.h>
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
@@ -1731,7 +1732,11 @@ err_phy_disconnect:
        return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int ag71xx_remove(struct platform_device *pdev)
+#else
+static void ag71xx_remove(struct platform_device *pdev)
+#endif
 {
        struct net_device *dev = platform_get_drvdata(pdev);
        struct ag71xx *ag;
@@ -1744,7 +1749,9 @@ static int ag71xx_remove(struct platform_device *pdev)
        ag71xx_phy_disconnect(ag);
        unregister_netdev(dev);
        platform_set_drvdata(pdev, NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id ag71xx_match[] = {

diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
index 5e5259a4920f7d87e7879ee3f6122b879aeaa8df..0c82c3126082ad0f436921b721e7a68d6cf1f7b0 100644 (file)
--- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
+++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
@@ -25,6 +25,7 @@
 #include <linux/phy.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
+#include <linux/version.h>
 
 /* DMA channels */
 #define DMA_CHAN_WIDTH                 0x10
@@ -1675,7 +1676,11 @@ out_disable_clk:
        return ret;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int bcm6348_emac_remove(struct platform_device *pdev)
+#else
+static void bcm6348_emac_remove(struct platform_device *pdev)
+#endif
 {
        struct net_device *ndev = platform_get_drvdata(pdev);
        struct bcm6348_emac *emac = netdev_priv(ndev);
@@ -1689,7 +1694,9 @@ static int bcm6348_emac_remove(struct platform_device *pdev)
        for (i = 0; i < emac->num_clocks; i++)
                clk_disable_unprepare(emac->clock[i]);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id bcm6348_emac_of_match[] = {

diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
index 7031a744909a828618387a3375be78229f4e6a96..cece6f1f5f695f5c9b9896baccef2f011757007a 100644 (file)
--- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
+++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
@@ -20,6 +20,7 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
+#include <linux/version.h>
 
 /* TODO: Bigger frames may work but we do not trust that they are safe on all
  * platforms so more research is needed, a max frame size of 2048 has been
@@ -1100,7 +1101,11 @@ out_disable_clk:
        return ret;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int bcm6368_enetsw_remove(struct platform_device *pdev)
+#else
+static void bcm6368_enetsw_remove(struct platform_device *pdev)
+#endif
 {
        struct device *dev = &pdev->dev;
        struct net_device *ndev = platform_get_drvdata(pdev);
@@ -1119,7 +1124,9 @@ static int bcm6368_enetsw_remove(struct platform_device *pdev)
        for (i = 0; i < priv->num_clocks; i++)
                clk_disable_unprepare(priv->clock[i]);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id bcm6368_enetsw_of_match[] = {

diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c
index 66013f273de77d1d5bc7f58d1616b6bfef1b598d..271df815e2cff08ba9466ebd9b8d94877165bead 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -1199,14 +1199,20 @@ static int adm6996_gpio_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int adm6996_gpio_remove(struct platform_device *pdev)
+#else
+static void adm6996_gpio_remove(struct platform_device *pdev)
+#endif
 {
        struct adm6996_priv *priv = platform_get_drvdata(pdev);
 
        if (priv && (priv->model == ADM6996M || priv->model == ADM6996L))
                unregister_switch(&priv->dev);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver adm6996_gpio_driver = {

diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.c b/target/linux/generic/files/drivers/net/phy/ar8327.c
index 33131495598084e122582493e977c4585dea7c1c..7bcc317e6adde3e19a87cdcc26812db5f6bf0a78 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/ar8327.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8327.c
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/of.h>
 #include <linux/list.h>
 #include <linux/bitops.h>
 #include <linux/switch.h>
@@ -1171,7 +1172,7 @@ ar8327_sw_hw_apply(struct switch_dev *dev)
        return 0;
 }
 
-int
+static int
 ar8327_sw_get_port_igmp_snooping(struct switch_dev *dev,
                                 const struct switch_attr *attr,
                                 struct switch_val *val)
@@ -1189,7 +1190,7 @@ ar8327_sw_get_port_igmp_snooping(struct switch_dev *dev,
        return 0;
 }
 
-int
+static int
 ar8327_sw_set_port_igmp_snooping(struct switch_dev *dev,
                                 const struct switch_attr *attr,
                                 struct switch_val *val)
@@ -1207,7 +1208,7 @@ ar8327_sw_set_port_igmp_snooping(struct switch_dev *dev,
        return 0;
 }
 
-int
+static int
 ar8327_sw_get_igmp_snooping(struct switch_dev *dev,
                            const struct switch_attr *attr,
                            struct switch_val *val)
@@ -1224,7 +1225,7 @@ ar8327_sw_get_igmp_snooping(struct switch_dev *dev,
        return 0;
 }
 
-int
+static int
 ar8327_sw_set_igmp_snooping(struct switch_dev *dev,
                            const struct switch_attr *attr,
                            struct switch_val *val)
@@ -1240,7 +1241,7 @@ ar8327_sw_set_igmp_snooping(struct switch_dev *dev,
        return 0;
 }
 
-int
+static int
 ar8327_sw_get_igmp_v3(struct switch_dev *dev,
                      const struct switch_attr *attr,
                      struct switch_val *val)
@@ -1256,7 +1257,7 @@ ar8327_sw_get_igmp_v3(struct switch_dev *dev,
        return 0;
 }
 
-int
+static int
 ar8327_sw_set_igmp_v3(struct switch_dev *dev,
                      const struct switch_attr *attr,
                      struct switch_val *val)

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
index 0a21ff1de55ed41b3d0a26c1946d6b03b1585dc3..241ba0f7d2d9f063bfa5868eda73221256ad89fe 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/b53.h>
+#include <linux/version.h>
 
 #include "b53_priv.h"
 
@@ -217,14 +218,20 @@ static int b53_mmap_probe(struct platform_device *pdev)
        return b53_swconfig_switch_register(dev);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int b53_mmap_remove(struct platform_device *pdev)
+#else
+static void b53_mmap_remove(struct platform_device *pdev)
+#endif
 {
        struct b53_device *dev = platform_get_drvdata(pdev);
 
        if (dev)
                b53_switch_remove(dev);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver b53_mmap_driver = {

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c b/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
index ead5209cf0b84b74b7e015b158eb81b63aafec2e..e63a6c09dbc0ea760587255925d4b43313ce9781 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/b53.h>
+#include <linux/version.h>
 
 #include "b53_priv.h"
 
@@ -354,14 +355,20 @@ static int b53_srab_probe(struct platform_device *pdev)
        return b53_swconfig_switch_register(dev);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int b53_srab_remove(struct platform_device *pdev)
+#else
+static void b53_srab_remove(struct platform_device *pdev)
+#endif
 {
        struct b53_device *dev = platform_get_drvdata(pdev);
 
        if (dev)
                b53_switch_remove(dev);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver b53_srab_driver = {

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index a26fd204cb25dbf25a4bc4c3deab21b1c1d29aed..89fc04fa64d75dec4c7cce42462d7a979ec72ec5 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -254,7 +254,7 @@ static int __rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 #define MDC_MDIO_WRITE_OP              0x0003
 #define MDC_REALTEK_PHY_ADDR           0x0
 
-int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+static int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 {
        u32 phy_id = smi->phy_id;
        struct mii_bus *mbus = smi->ext_mbus;
@@ -1527,7 +1527,7 @@ static void rtl8366_smi_reset(struct rtl8366_smi *smi, bool active)
                reset_control_deassert(smi->reset);
 }
 
-int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+static int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
 {
        int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
        int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
@@ -1577,7 +1577,7 @@ static inline int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8
 }
 #endif
 
-int rtl8366_smi_probe_plat(struct platform_device *pdev, struct rtl8366_smi *smi)
+static int rtl8366_smi_probe_plat(struct platform_device *pdev, struct rtl8366_smi *smi)
 {
        struct rtl8366_platform_data *pdata = pdev->dev.platform_data;
 

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 0878ca9f1400cf3d214165b37a6f67976d9de57c..8e985f0020d3c3c3406c9e16ba35cf8630ce70a1 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/rtl8366.h>
+#include <linux/version.h>
 
 #include "rtl8366_smi.h"
 
@@ -1478,7 +1479,11 @@ static int rtl8366rb_probe(struct platform_device *pdev)
        return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rtl8366rb_remove(struct platform_device *pdev)
+#else
+static void rtl8366rb_remove(struct platform_device *pdev)
+#endif
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
@@ -1489,7 +1494,9 @@ static int rtl8366rb_remove(struct platform_device *pdev)
                kfree(smi);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 #ifdef CONFIG_OF

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index d4045fcc06225956b9827e44123c548a6d96abe9..9ecedd8e5455d88680d351cd965a94fd35addf82 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/rtl8366.h>
+#include <linux/version.h>
 
 #include "rtl8366_smi.h"
 
@@ -1266,7 +1267,11 @@ static int rtl8366s_probe(struct platform_device *pdev)
        return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rtl8366s_remove(struct platform_device *pdev)
+#else
+static void rtl8366s_remove(struct platform_device *pdev)
+#endif
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
@@ -1277,7 +1282,9 @@ static int rtl8366s_remove(struct platform_device *pdev)
                kfree(smi);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 #ifdef CONFIG_OF

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367.c b/target/linux/generic/files/drivers/net/phy/rtl8367.c
index 950e9d2767d9ecdc794e3440677aaa070607b11d..97dc4d207817cc27c5f9e17de008f0ad0d93b2e6 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8367.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/rtl8367.h>
+#include <linux/version.h>
 
 #include "rtl8366_smi.h"
 
@@ -1801,7 +1802,11 @@ static int rtl8367_probe(struct platform_device *pdev)
        return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rtl8367_remove(struct platform_device *pdev)
+#else
+static void rtl8367_remove(struct platform_device *pdev)
+#endif
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
@@ -1812,7 +1817,9 @@ static int rtl8367_remove(struct platform_device *pdev)
                kfree(smi);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static void rtl8367_shutdown(struct platform_device *pdev)

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index 5f885aa5be8cd575fd09c9f0f27c82ffce1964c2..6345afb25c7d4b637e897c33d73142aaf35666c6 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/rtl8367.h>
+#include <linux/version.h>
 
 #include "rtl8366_smi.h"
 
@@ -1600,7 +1601,11 @@ static int  rtl8367b_probe(struct platform_device *pdev)
        return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rtl8367b_remove(struct platform_device *pdev)
+#else
+static void rtl8367b_remove(struct platform_device *pdev)
+#endif
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
@@ -1611,7 +1616,9 @@ static int rtl8367b_remove(struct platform_device *pdev)
                kfree(smi);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static void rtl8367b_shutdown(struct platform_device *pdev)

diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index 10dc8d0607aa93bd484f05039393f46a30f5f4bc..71dd5b31f541eb2d2fbb8757fdf4bbf1fbba23c7 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -1057,7 +1057,7 @@ static struct genl_family switch_fam = {
 };
 
 #ifdef CONFIG_OF
-void
+static void
 of_switch_load_portmap(struct switch_dev *dev)
 {
        struct device_node *port;

diff --git a/target/linux/mediatek/files/drivers/net/phy/rtk/rtl8367s_mdio.c b/target/linux/mediatek/files/drivers/net/phy/rtk/rtl8367s_mdio.c
index d958d622e0c28c85fe5d829fb1f51a5ee12a0227..69dc966b046fb0f87f159d41828c89d83a28dadb 100644 (file)
--- a/target/linux/mediatek/files/drivers/net/phy/rtk/rtl8367s_mdio.c
+++ b/target/linux/mediatek/files/drivers/net/phy/rtk/rtl8367s_mdio.c
@@ -19,7 +19,7 @@
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
-
+#include <linux/version.h>
 
 #include  "./rtl8367c/include/rtk_switch.h"
 #include  "./rtl8367c/include/port.h"
@@ -283,12 +283,18 @@ static int rtk_gsw_probe(struct platform_device *pdev)
        
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int rtk_gsw_remove(struct platform_device *pdev)
+#else
+static void rtk_gsw_remove(struct platform_device *pdev)
+#endif
 {
        platform_set_drvdata(pdev, NULL);
        gsw_debug_proc_exit();
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver gsw_driver = {

diff --git a/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c b/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
index a3a9a7f4ae9d09b93218affd9ebdb3b98b555a4a..35abdf8514ec454332a5797a0dde1c12a0315929 100644 (file)
--- a/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
+++ b/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
@@ -17,6 +17,7 @@
 #include <linux/of_dma.h>
 #include <linux/reset.h>
 #include <linux/of_device.h>
+#include <linux/version.h>
 
 #include "../virt-dma.h"
 
@@ -733,7 +734,11 @@ err_uninit_hsdma:
        return ret;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int mtk_hsdma_remove(struct platform_device *pdev)
+#else
+static void mtk_hsdma_remove(struct platform_device *pdev)
+#endif
 {
        struct mtk_hsdam_engine *hsdma = platform_get_drvdata(pdev);
 
@@ -742,7 +747,9 @@ static int mtk_hsdma_remove(struct platform_device *pdev)
        of_dma_controller_free(pdev->dev.of_node);
        dma_async_device_unregister(&hsdma->ddev);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver mtk_hsdma_driver = {

diff --git a/target/linux/ramips/files/drivers/dma/ralink-gdma.c b/target/linux/ramips/files/drivers/dma/ralink-gdma.c
index e510a05ebbe319c820739b5bd0911a9202afc656..cd7359ba0e64fba9f2aca58aef41f0227491fbe3 100644 (file)
--- a/target/linux/ramips/files/drivers/dma/ralink-gdma.c
+++ b/target/linux/ramips/files/drivers/dma/ralink-gdma.c
@@ -16,6 +16,7 @@
 #include <linux/of_dma.h>
 #include <linux/reset.h>
 #include <linux/of_device.h>
+#include <linux/version.h>
 
 #include "virt-dma.h"
 
@@ -890,7 +891,11 @@ err_unregister:
        return ret;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int gdma_dma_remove(struct platform_device *pdev)
+#else
+static void gdma_dma_remove(struct platform_device *pdev)
+#endif
 {
        struct gdma_dma_dev *dma_dev = platform_get_drvdata(pdev);
 
@@ -898,7 +903,9 @@ static int gdma_dma_remove(struct platform_device *pdev)
        of_dma_controller_free(pdev->dev.of_node);
        dma_async_device_unregister(&dma_dev->ddev);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver gdma_dma_driver = {

diff --git a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c
index df95900a26ed27278d2fb6f05c7a1c89827bc7ca..7866dffdbcb922762aa979166f81576a1ab5dd7b 100644 (file)
--- a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c
+++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c
@@ -40,6 +40,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
+#include <linux/version.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
@@ -2352,7 +2353,11 @@ host_free:
 }
 
 /* 4 device share one driver, using "drvdata" to show difference */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int msdc_drv_remove(struct platform_device *pdev)
+#else
+static void msdc_drv_remove(struct platform_device *pdev)
+#endif
 {
        struct mmc_host *mmc;
        struct msdc_host *host;
@@ -2378,7 +2383,9 @@ static int msdc_drv_remove(struct platform_device *pdev)
 
        mmc_free_host(host->mmc);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 /* Fix me: Power Flow */

diff --git a/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c b/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c
index 0ac191ea66854ec67aeef691f05c314ec39c6564..8f2da78ab675d21926de4140cee08410672a39f9 100644 (file)
--- a/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c
+++ b/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c
@@ -20,6 +20,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtk_bmt.h>
 #include <linux/platform_device.h>
+#include <linux/version.h>
 #include <asm/addrspace.h>
 
 /* NFI core registers */
@@ -1312,7 +1313,11 @@ static int mt7621_nfc_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int mt7621_nfc_remove(struct platform_device *pdev)
+#else
+static void mt7621_nfc_remove(struct platform_device *pdev)
+#endif
 {
        struct mt7621_nfc *nfc = platform_get_drvdata(pdev);
        struct nand_chip *nand = &nfc->nand;
@@ -1322,7 +1327,9 @@ static int mt7621_nfc_remove(struct platform_device *pdev)
        mtd_device_unregister(mtd);
        nand_cleanup(nand);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id mt7621_nfc_id_table[] = {

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c
index bbb52d74b240a2f25e57ec96f5bab4f33085b987..394325a3589dc9166cebcc41026390fd20901e3d 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/esw_rt3050.c
@@ -19,6 +19,7 @@
 #include <asm/mach-ralink/ralink_regs.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/version.h>
 
 #include <linux/switch.h>
 #include <linux/reset.h>
@@ -1437,7 +1438,11 @@ static int esw_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int esw_remove(struct platform_device *pdev)
+#else
+static void esw_remove(struct platform_device *pdev)
+#endif
 {
        struct rt305x_esw *esw = platform_get_drvdata(pdev);
 
@@ -1446,7 +1451,9 @@ static int esw_remove(struct platform_device *pdev)
                platform_set_drvdata(pdev, NULL);
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static const struct of_device_id ralink_esw_match[] = {

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c
index 5d4cebb089684e25ce1538e3a0e7c82c9ca8f543..63d904e4bff4cf5d536e5ecfd84e8b1e0f226284 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c
@@ -13,6 +13,7 @@
  */
 
 #include "mtk_eth_soc.h"
+#include "ethtool.h"
 
 static const char fe_gdma_str[][ETH_GSTRING_LEN] = {
 #define _FE(x...)      # x,
@@ -70,9 +71,9 @@ static void fe_get_drvinfo(struct net_device *dev,
        struct fe_priv *priv = netdev_priv(dev);
        struct fe_soc_data *soc = priv->soc;
 
-       strlcpy(info->driver, priv->dev->driver->name, sizeof(info->driver));
-       strlcpy(info->version, MTK_FE_DRV_VERSION, sizeof(info->version));
-       strlcpy(info->bus_info, dev_name(priv->dev), sizeof(info->bus_info));
+       strscpy(info->driver, priv->dev->driver->name, sizeof(info->driver));
+       strscpy(info->version, MTK_FE_DRV_VERSION, sizeof(info->version));
+       strscpy(info->bus_info, dev_name(priv->dev), sizeof(info->bus_info));
 
        if (soc->reg_table[FE_REG_FE_COUNTER_BASE])
                info->n_stats = ARRAY_SIZE(fe_gdma_str);

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c
index 154983494ee1aa47e6705062189910b3729b7d2e..c8d0e54cd0a48d0c67d4d66b8017076fb57e340b 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/gsw_mt7620.c
@@ -19,6 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/version.h>
 
 #include <ralink_regs.h>
 
@@ -284,11 +286,17 @@ static int mt7620_gsw_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int mt7620_gsw_remove(struct platform_device *pdev)
+#else
+static void mt7620_gsw_remove(struct platform_device *pdev)
+#endif
 {
        platform_set_drvdata(pdev, NULL);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver gsw_driver = {

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
index b4632d39904fcb682eac2e4429ec574171658ac7..0722dfb0aab38fca83914a95bda9b33052a60228 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
@@ -30,6 +30,7 @@
 #include <linux/etherdevice.h>
 #include <linux/lockdep.h>
 #include <linux/workqueue.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <asm/byteorder.h>
 
@@ -209,7 +210,7 @@ struct mt7530_mapping {
        },
 };
 
-struct mt7530_mapping*
+static struct mt7530_mapping*
 mt7530_find_mapping(struct device_node *np)
 {
        const char *map;

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
index 4dff1340d7057172297a6bd77d6a24a1f51b2eeb..2a943e494d3aa7c32af7307eb19f7102aee524c8 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
@@ -35,6 +35,7 @@
 #include <linux/of_gpio.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
+#include <linux/version.h>
 
 #include <asm/mach-ralink/ralink_regs.h>
 
@@ -1638,7 +1639,11 @@ static int fe_probe(struct platform_device *pdev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
 static int fe_remove(struct platform_device *pdev)
+#else
+static void fe_remove(struct platform_device *pdev)
+#endif
 {
        struct net_device *dev = platform_get_drvdata(pdev);
        struct fe_priv *priv = netdev_priv(dev);
@@ -1649,7 +1654,9 @@ static int fe_remove(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, NULL);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
        return 0;
+#endif
 }
 
 static struct platform_driver fe_driver = {