rtl8366_smi: add linux 4.4 compatibility

[openwrt/openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366_smi.c

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 e2b4f02efaad11a2c627deb1fb671112bd5bdd4a..b8cdf30de48c8b94ec54fa78819fb093830e6650 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -19,6 +19,7 @@
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/rtl8366.h>
+#include <linux/version.h>
 
 #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 #include <linux/debugfs.h>
@@ -743,7 +744,7 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file,
                buf[len - 1] = '\0';
 
 
-       if (strict_strtoul(buf, 16, &data)) {
+       if (kstrtoul(buf, 16, &data)) {
                dev_err(smi->parent, "Invalid reg value %s\n", buf);
        } else {
                err = rtl8366_smi_write_reg(smi, reg, data);
@@ -914,7 +915,6 @@ static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
 static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 {
        int ret;
-       int i;
 
        smi->mii_bus = mdiobus_alloc();
        if (smi->mii_bus == NULL) {
@@ -930,9 +930,14 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
                 dev_name(smi->parent));
        smi->mii_bus->parent = smi->parent;
        smi->mii_bus->phy_mask = ~(0x1f);
-       smi->mii_bus->irq = smi->mii_irq;
-       for (i = 0; i < PHY_MAX_ADDR; i++)
-               smi->mii_irq[i] = PHY_POLL;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
+       {
+               int i;
+               smi->mii_bus->irq = smi->mii_irq;
+               for (i = 0; i < PHY_MAX_ADDR; i++)
+                       smi->mii_irq[i] = PHY_POLL;
+       }
+#endif
 
        ret = mdiobus_register(smi->mii_bus);
        if (ret)