net: Allow FIXED_PHY to be modular.
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2014 19:30:09 +0000 (14:30 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2014 20:02:23 +0000 (15:02 -0500)
Otherwise we get things like:

warning: (NET_DSA_BCM_SF2 && BCMGENET && SYSTEMPORT) selects FIXED_PHY which has unmet direct dependencies (NETDEVICES && PHYLIB=y)

In order to make this work we have to rename fixed.c to fixed_phy.c
because the regulator drivers already have a module named "fixed.o".

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
drivers/net/phy/fixed.c [deleted file]
drivers/net/phy/fixed_phy.c [new file with mode: 0644]
include/linux/phy_fixed.h

index b4b0f80..a3c251b 100644 (file)
@@ -119,8 +119,8 @@ config MICREL_PHY
          Supports the KSZ9021, VSC8201, KS8001 PHYs.
 
 config FIXED_PHY
-       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
-       depends on PHYLIB=y
+       tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB
        ---help---
          Adds the platform "fixed" MDIO Bus to cover the boards that use
          PHYs that are not connected to the real MDIO bus.
index eb3b18b..501ea76 100644 (file)
@@ -17,7 +17,7 @@ obj-$(CONFIG_BCM87XX_PHY)     += bcm87xx.o
 obj-$(CONFIG_ICPLUS_PHY)       += icplus.o
 obj-$(CONFIG_REALTEK_PHY)      += realtek.o
 obj-$(CONFIG_LSI_ET1011C_PHY)  += et1011c.o
-obj-$(CONFIG_FIXED_PHY)                += fixed.o
+obj-$(CONFIG_FIXED_PHY)                += fixed_phy.o
 obj-$(CONFIG_MDIO_BITBANG)     += mdio-bitbang.o
 obj-$(CONFIG_MDIO_GPIO)                += mdio-gpio.o
 obj-$(CONFIG_NATIONAL_PHY)     += national.o
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
deleted file mode 100644 (file)
index 3ad0e6e..0000000
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Fixed MDIO bus (MDIO bus emulation with fixed PHYs)
- *
- * Author: Vitaly Bordug <vbordug@ru.mvista.com>
- *         Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * Copyright (c) 2006-2007 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/list.h>
-#include <linux/mii.h>
-#include <linux/phy.h>
-#include <linux/phy_fixed.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-#include <linux/of.h>
-
-#define MII_REGS_NUM 29
-
-struct fixed_mdio_bus {
-       int irqs[PHY_MAX_ADDR];
-       struct mii_bus *mii_bus;
-       struct list_head phys;
-};
-
-struct fixed_phy {
-       int addr;
-       u16 regs[MII_REGS_NUM];
-       struct phy_device *phydev;
-       struct fixed_phy_status status;
-       int (*link_update)(struct net_device *, struct fixed_phy_status *);
-       struct list_head node;
-};
-
-static struct platform_device *pdev;
-static struct fixed_mdio_bus platform_fmb = {
-       .phys = LIST_HEAD_INIT(platform_fmb.phys),
-};
-
-static int fixed_phy_update_regs(struct fixed_phy *fp)
-{
-       u16 bmsr = BMSR_ANEGCAPABLE;
-       u16 bmcr = 0;
-       u16 lpagb = 0;
-       u16 lpa = 0;
-
-       if (fp->status.duplex) {
-               bmcr |= BMCR_FULLDPLX;
-
-               switch (fp->status.speed) {
-               case 1000:
-                       bmsr |= BMSR_ESTATEN;
-                       bmcr |= BMCR_SPEED1000;
-                       lpagb |= LPA_1000FULL;
-                       break;
-               case 100:
-                       bmsr |= BMSR_100FULL;
-                       bmcr |= BMCR_SPEED100;
-                       lpa |= LPA_100FULL;
-                       break;
-               case 10:
-                       bmsr |= BMSR_10FULL;
-                       lpa |= LPA_10FULL;
-                       break;
-               default:
-                       pr_warn("fixed phy: unknown speed\n");
-                       return -EINVAL;
-               }
-       } else {
-               switch (fp->status.speed) {
-               case 1000:
-                       bmsr |= BMSR_ESTATEN;
-                       bmcr |= BMCR_SPEED1000;
-                       lpagb |= LPA_1000HALF;
-                       break;
-               case 100:
-                       bmsr |= BMSR_100HALF;
-                       bmcr |= BMCR_SPEED100;
-                       lpa |= LPA_100HALF;
-                       break;
-               case 10:
-                       bmsr |= BMSR_10HALF;
-                       lpa |= LPA_10HALF;
-                       break;
-               default:
-                       pr_warn("fixed phy: unknown speed\n");
-                       return -EINVAL;
-               }
-       }
-
-       if (fp->status.link)
-               bmsr |= BMSR_LSTATUS | BMSR_ANEGCOMPLETE;
-
-       if (fp->status.pause)
-               lpa |= LPA_PAUSE_CAP;
-
-       if (fp->status.asym_pause)
-               lpa |= LPA_PAUSE_ASYM;
-
-       fp->regs[MII_PHYSID1] = 0;
-       fp->regs[MII_PHYSID2] = 0;
-
-       fp->regs[MII_BMSR] = bmsr;
-       fp->regs[MII_BMCR] = bmcr;
-       fp->regs[MII_LPA] = lpa;
-       fp->regs[MII_STAT1000] = lpagb;
-
-       return 0;
-}
-
-static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)
-{
-       struct fixed_mdio_bus *fmb = bus->priv;
-       struct fixed_phy *fp;
-
-       if (reg_num >= MII_REGS_NUM)
-               return -1;
-
-       /* We do not support emulating Clause 45 over Clause 22 register reads
-        * return an error instead of bogus data.
-        */
-       switch (reg_num) {
-       case MII_MMD_CTRL:
-       case MII_MMD_DATA:
-               return -1;
-       default:
-               break;
-       }
-
-       list_for_each_entry(fp, &fmb->phys, node) {
-               if (fp->addr == phy_addr) {
-                       /* Issue callback if user registered it. */
-                       if (fp->link_update) {
-                               fp->link_update(fp->phydev->attached_dev,
-                                               &fp->status);
-                               fixed_phy_update_regs(fp);
-                       }
-                       return fp->regs[reg_num];
-               }
-       }
-
-       return 0xFFFF;
-}
-
-static int fixed_mdio_write(struct mii_bus *bus, int phy_addr, int reg_num,
-                           u16 val)
-{
-       return 0;
-}
-
-/*
- * If something weird is required to be done with link/speed,
- * network driver is able to assign a function to implement this.
- * May be useful for PHY's that need to be software-driven.
- */
-int fixed_phy_set_link_update(struct phy_device *phydev,
-                             int (*link_update)(struct net_device *,
-                                                struct fixed_phy_status *))
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct fixed_phy *fp;
-
-       if (!link_update || !phydev || !phydev->bus)
-               return -EINVAL;
-
-       list_for_each_entry(fp, &fmb->phys, node) {
-               if (fp->addr == phydev->addr) {
-                       fp->link_update = link_update;
-                       fp->phydev = phydev;
-                       return 0;
-               }
-       }
-
-       return -ENOENT;
-}
-EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);
-
-int fixed_phy_add(unsigned int irq, int phy_addr,
-                 struct fixed_phy_status *status)
-{
-       int ret;
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct fixed_phy *fp;
-
-       fp = kzalloc(sizeof(*fp), GFP_KERNEL);
-       if (!fp)
-               return -ENOMEM;
-
-       memset(fp->regs, 0xFF,  sizeof(fp->regs[0]) * MII_REGS_NUM);
-
-       fmb->irqs[phy_addr] = irq;
-
-       fp->addr = phy_addr;
-       fp->status = *status;
-
-       ret = fixed_phy_update_regs(fp);
-       if (ret)
-               goto err_regs;
-
-       list_add_tail(&fp->node, &fmb->phys);
-
-       return 0;
-
-err_regs:
-       kfree(fp);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(fixed_phy_add);
-
-void fixed_phy_del(int phy_addr)
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct fixed_phy *fp, *tmp;
-
-       list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
-               if (fp->addr == phy_addr) {
-                       list_del(&fp->node);
-                       kfree(fp);
-                       return;
-               }
-       }
-}
-EXPORT_SYMBOL_GPL(fixed_phy_del);
-
-static int phy_fixed_addr;
-static DEFINE_SPINLOCK(phy_fixed_addr_lock);
-
-struct phy_device *fixed_phy_register(unsigned int irq,
-                                     struct fixed_phy_status *status,
-                                     struct device_node *np)
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct phy_device *phy;
-       int phy_addr;
-       int ret;
-
-       /* Get the next available PHY address, up to PHY_MAX_ADDR */
-       spin_lock(&phy_fixed_addr_lock);
-       if (phy_fixed_addr == PHY_MAX_ADDR) {
-               spin_unlock(&phy_fixed_addr_lock);
-               return ERR_PTR(-ENOSPC);
-       }
-       phy_addr = phy_fixed_addr++;
-       spin_unlock(&phy_fixed_addr_lock);
-
-       ret = fixed_phy_add(PHY_POLL, phy_addr, status);
-       if (ret < 0)
-               return ERR_PTR(ret);
-
-       phy = get_phy_device(fmb->mii_bus, phy_addr, false);
-       if (!phy || IS_ERR(phy)) {
-               fixed_phy_del(phy_addr);
-               return ERR_PTR(-EINVAL);
-       }
-
-       of_node_get(np);
-       phy->dev.of_node = np;
-
-       ret = phy_device_register(phy);
-       if (ret) {
-               phy_device_free(phy);
-               of_node_put(np);
-               fixed_phy_del(phy_addr);
-               return ERR_PTR(ret);
-       }
-
-       return phy;
-}
-EXPORT_SYMBOL_GPL(fixed_phy_register);
-
-static int __init fixed_mdio_bus_init(void)
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       int ret;
-
-       pdev = platform_device_register_simple("Fixed MDIO bus", 0, NULL, 0);
-       if (IS_ERR(pdev)) {
-               ret = PTR_ERR(pdev);
-               goto err_pdev;
-       }
-
-       fmb->mii_bus = mdiobus_alloc();
-       if (fmb->mii_bus == NULL) {
-               ret = -ENOMEM;
-               goto err_mdiobus_reg;
-       }
-
-       snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "fixed-0");
-       fmb->mii_bus->name = "Fixed MDIO Bus";
-       fmb->mii_bus->priv = fmb;
-       fmb->mii_bus->parent = &pdev->dev;
-       fmb->mii_bus->read = &fixed_mdio_read;
-       fmb->mii_bus->write = &fixed_mdio_write;
-       fmb->mii_bus->irq = fmb->irqs;
-
-       ret = mdiobus_register(fmb->mii_bus);
-       if (ret)
-               goto err_mdiobus_alloc;
-
-       return 0;
-
-err_mdiobus_alloc:
-       mdiobus_free(fmb->mii_bus);
-err_mdiobus_reg:
-       platform_device_unregister(pdev);
-err_pdev:
-       return ret;
-}
-module_init(fixed_mdio_bus_init);
-
-static void __exit fixed_mdio_bus_exit(void)
-{
-       struct fixed_mdio_bus *fmb = &platform_fmb;
-       struct fixed_phy *fp, *tmp;
-
-       mdiobus_unregister(fmb->mii_bus);
-       mdiobus_free(fmb->mii_bus);
-       platform_device_unregister(pdev);
-
-       list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
-               list_del(&fp->node);
-               kfree(fp);
-       }
-}
-module_exit(fixed_mdio_bus_exit);
-
-MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
-MODULE_AUTHOR("Vitaly Bordug");
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
new file mode 100644 (file)
index 0000000..3ad0e6e
--- /dev/null
@@ -0,0 +1,337 @@
+/*
+ * Fixed MDIO bus (MDIO bus emulation with fixed PHYs)
+ *
+ * Author: Vitaly Bordug <vbordug@ru.mvista.com>
+ *         Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * Copyright (c) 2006-2007 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/mii.h>
+#include <linux/phy.h>
+#include <linux/phy_fixed.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+
+#define MII_REGS_NUM 29
+
+struct fixed_mdio_bus {
+       int irqs[PHY_MAX_ADDR];
+       struct mii_bus *mii_bus;
+       struct list_head phys;
+};
+
+struct fixed_phy {
+       int addr;
+       u16 regs[MII_REGS_NUM];
+       struct phy_device *phydev;
+       struct fixed_phy_status status;
+       int (*link_update)(struct net_device *, struct fixed_phy_status *);
+       struct list_head node;
+};
+
+static struct platform_device *pdev;
+static struct fixed_mdio_bus platform_fmb = {
+       .phys = LIST_HEAD_INIT(platform_fmb.phys),
+};
+
+static int fixed_phy_update_regs(struct fixed_phy *fp)
+{
+       u16 bmsr = BMSR_ANEGCAPABLE;
+       u16 bmcr = 0;
+       u16 lpagb = 0;
+       u16 lpa = 0;
+
+       if (fp->status.duplex) {
+               bmcr |= BMCR_FULLDPLX;
+
+               switch (fp->status.speed) {
+               case 1000:
+                       bmsr |= BMSR_ESTATEN;
+                       bmcr |= BMCR_SPEED1000;
+                       lpagb |= LPA_1000FULL;
+                       break;
+               case 100:
+                       bmsr |= BMSR_100FULL;
+                       bmcr |= BMCR_SPEED100;
+                       lpa |= LPA_100FULL;
+                       break;
+               case 10:
+                       bmsr |= BMSR_10FULL;
+                       lpa |= LPA_10FULL;
+                       break;
+               default:
+                       pr_warn("fixed phy: unknown speed\n");
+                       return -EINVAL;
+               }
+       } else {
+               switch (fp->status.speed) {
+               case 1000:
+                       bmsr |= BMSR_ESTATEN;
+                       bmcr |= BMCR_SPEED1000;
+                       lpagb |= LPA_1000HALF;
+                       break;
+               case 100:
+                       bmsr |= BMSR_100HALF;
+                       bmcr |= BMCR_SPEED100;
+                       lpa |= LPA_100HALF;
+                       break;
+               case 10:
+                       bmsr |= BMSR_10HALF;
+                       lpa |= LPA_10HALF;
+                       break;
+               default:
+                       pr_warn("fixed phy: unknown speed\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (fp->status.link)
+               bmsr |= BMSR_LSTATUS | BMSR_ANEGCOMPLETE;
+
+       if (fp->status.pause)
+               lpa |= LPA_PAUSE_CAP;
+
+       if (fp->status.asym_pause)
+               lpa |= LPA_PAUSE_ASYM;
+
+       fp->regs[MII_PHYSID1] = 0;
+       fp->regs[MII_PHYSID2] = 0;
+
+       fp->regs[MII_BMSR] = bmsr;
+       fp->regs[MII_BMCR] = bmcr;
+       fp->regs[MII_LPA] = lpa;
+       fp->regs[MII_STAT1000] = lpagb;
+
+       return 0;
+}
+
+static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)
+{
+       struct fixed_mdio_bus *fmb = bus->priv;
+       struct fixed_phy *fp;
+
+       if (reg_num >= MII_REGS_NUM)
+               return -1;
+
+       /* We do not support emulating Clause 45 over Clause 22 register reads
+        * return an error instead of bogus data.
+        */
+       switch (reg_num) {
+       case MII_MMD_CTRL:
+       case MII_MMD_DATA:
+               return -1;
+       default:
+               break;
+       }
+
+       list_for_each_entry(fp, &fmb->phys, node) {
+               if (fp->addr == phy_addr) {
+                       /* Issue callback if user registered it. */
+                       if (fp->link_update) {
+                               fp->link_update(fp->phydev->attached_dev,
+                                               &fp->status);
+                               fixed_phy_update_regs(fp);
+                       }
+                       return fp->regs[reg_num];
+               }
+       }
+
+       return 0xFFFF;
+}
+
+static int fixed_mdio_write(struct mii_bus *bus, int phy_addr, int reg_num,
+                           u16 val)
+{
+       return 0;
+}
+
+/*
+ * If something weird is required to be done with link/speed,
+ * network driver is able to assign a function to implement this.
+ * May be useful for PHY's that need to be software-driven.
+ */
+int fixed_phy_set_link_update(struct phy_device *phydev,
+                             int (*link_update)(struct net_device *,
+                                                struct fixed_phy_status *))
+{
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct fixed_phy *fp;
+
+       if (!link_update || !phydev || !phydev->bus)
+               return -EINVAL;
+
+       list_for_each_entry(fp, &fmb->phys, node) {
+               if (fp->addr == phydev->addr) {
+                       fp->link_update = link_update;
+                       fp->phydev = phydev;
+                       return 0;
+               }
+       }
+
+       return -ENOENT;
+}
+EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);
+
+int fixed_phy_add(unsigned int irq, int phy_addr,
+                 struct fixed_phy_status *status)
+{
+       int ret;
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct fixed_phy *fp;
+
+       fp = kzalloc(sizeof(*fp), GFP_KERNEL);
+       if (!fp)
+               return -ENOMEM;
+
+       memset(fp->regs, 0xFF,  sizeof(fp->regs[0]) * MII_REGS_NUM);
+
+       fmb->irqs[phy_addr] = irq;
+
+       fp->addr = phy_addr;
+       fp->status = *status;
+
+       ret = fixed_phy_update_regs(fp);
+       if (ret)
+               goto err_regs;
+
+       list_add_tail(&fp->node, &fmb->phys);
+
+       return 0;
+
+err_regs:
+       kfree(fp);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(fixed_phy_add);
+
+void fixed_phy_del(int phy_addr)
+{
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct fixed_phy *fp, *tmp;
+
+       list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
+               if (fp->addr == phy_addr) {
+                       list_del(&fp->node);
+                       kfree(fp);
+                       return;
+               }
+       }
+}
+EXPORT_SYMBOL_GPL(fixed_phy_del);
+
+static int phy_fixed_addr;
+static DEFINE_SPINLOCK(phy_fixed_addr_lock);
+
+struct phy_device *fixed_phy_register(unsigned int irq,
+                                     struct fixed_phy_status *status,
+                                     struct device_node *np)
+{
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct phy_device *phy;
+       int phy_addr;
+       int ret;
+
+       /* Get the next available PHY address, up to PHY_MAX_ADDR */
+       spin_lock(&phy_fixed_addr_lock);
+       if (phy_fixed_addr == PHY_MAX_ADDR) {
+               spin_unlock(&phy_fixed_addr_lock);
+               return ERR_PTR(-ENOSPC);
+       }
+       phy_addr = phy_fixed_addr++;
+       spin_unlock(&phy_fixed_addr_lock);
+
+       ret = fixed_phy_add(PHY_POLL, phy_addr, status);
+       if (ret < 0)
+               return ERR_PTR(ret);
+
+       phy = get_phy_device(fmb->mii_bus, phy_addr, false);
+       if (!phy || IS_ERR(phy)) {
+               fixed_phy_del(phy_addr);
+               return ERR_PTR(-EINVAL);
+       }
+
+       of_node_get(np);
+       phy->dev.of_node = np;
+
+       ret = phy_device_register(phy);
+       if (ret) {
+               phy_device_free(phy);
+               of_node_put(np);
+               fixed_phy_del(phy_addr);
+               return ERR_PTR(ret);
+       }
+
+       return phy;
+}
+EXPORT_SYMBOL_GPL(fixed_phy_register);
+
+static int __init fixed_mdio_bus_init(void)
+{
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       int ret;
+
+       pdev = platform_device_register_simple("Fixed MDIO bus", 0, NULL, 0);
+       if (IS_ERR(pdev)) {
+               ret = PTR_ERR(pdev);
+               goto err_pdev;
+       }
+
+       fmb->mii_bus = mdiobus_alloc();
+       if (fmb->mii_bus == NULL) {
+               ret = -ENOMEM;
+               goto err_mdiobus_reg;
+       }
+
+       snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "fixed-0");
+       fmb->mii_bus->name = "Fixed MDIO Bus";
+       fmb->mii_bus->priv = fmb;
+       fmb->mii_bus->parent = &pdev->dev;
+       fmb->mii_bus->read = &fixed_mdio_read;
+       fmb->mii_bus->write = &fixed_mdio_write;
+       fmb->mii_bus->irq = fmb->irqs;
+
+       ret = mdiobus_register(fmb->mii_bus);
+       if (ret)
+               goto err_mdiobus_alloc;
+
+       return 0;
+
+err_mdiobus_alloc:
+       mdiobus_free(fmb->mii_bus);
+err_mdiobus_reg:
+       platform_device_unregister(pdev);
+err_pdev:
+       return ret;
+}
+module_init(fixed_mdio_bus_init);
+
+static void __exit fixed_mdio_bus_exit(void)
+{
+       struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct fixed_phy *fp, *tmp;
+
+       mdiobus_unregister(fmb->mii_bus);
+       mdiobus_free(fmb->mii_bus);
+       platform_device_unregister(pdev);
+
+       list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
+               list_del(&fp->node);
+               kfree(fp);
+       }
+}
+module_exit(fixed_mdio_bus_exit);
+
+MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
+MODULE_AUTHOR("Vitaly Bordug");
+MODULE_LICENSE("GPL");
index f2ca1b4..7e75bfe 100644 (file)
@@ -11,7 +11,7 @@ struct fixed_phy_status {
 
 struct device_node;
 
-#ifdef CONFIG_FIXED_PHY
+#if IS_ENABLED(CONFIG_FIXED_PHY)
 extern int fixed_phy_add(unsigned int irq, int phy_id,
                         struct fixed_phy_status *status);
 extern struct phy_device *fixed_phy_register(unsigned int irq,