From: Bartosz Golaszewski <bgolaszew...@baylibre.com>
The last argument passed to phy_device_create() (c45_ids) is never used
in current mainline outside of the core PHY code - it can only be
configured when reading the PHY ID from phy_device_read_id().
Let's drop this argument treewide.
Signed-off-by: Bartosz Golaszewski <bgolaszew...@baylibre.com>
---
drivers/net/phy/nxp-tja11xx.c | 2 +-
drivers/net/phy/phy_device.c | 8 +++-----
drivers/of/of_mdio.c | 2 +-
include/linux/phy.h | 3 +--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index a72fa0d2e7c7..b98b620ef88c 100644
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -507,7 +507,7 @@ static void tja1102_p1_register(struct work_struct *work)
}
/* Real PHY ID of Port 1 is 0 */
- phy = phy_device_create(bus, addr, PHY_ID_TJA1102, false, NULL);
+ phy = phy_device_create(bus, addr, PHY_ID_TJA1102, false);
if (IS_ERR(phy)) {
dev_err(dev, "Can't create PHY device for Port 1: %i\n",
addr);
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 94944fffa9bb..ad7c4cd9d357 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -613,8 +613,7 @@ static int phy_request_driver_module(struct phy_device
*phydev)
}
struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
- bool is_c45,
- struct phy_c45_device_ids *c45_ids)
+ bool is_c45)
{
struct phy_device *dev;
struct mdio_device *mdiodev;
@@ -647,8 +646,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus,
int addr, u32 phy_id,
dev->is_c45 = is_c45;
dev->phy_id = phy_id;
- if (c45_ids)
- dev->c45_ids = *c45_ids;
+
dev->irq = bus->irq[addr];
dev_set_name(&mdiodev->dev, PHY_ID_FMT, bus->id, addr);
@@ -829,7 +827,7 @@ static int phy_device_read_id(struct phy_device *phydev)
*/
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
{
- return phy_device_create(bus, addr, PHY_ID_NONE, is_c45, NULL);
+ return phy_device_create(bus, addr, PHY_ID_NONE, is_c45);
}
EXPORT_SYMBOL(get_phy_device);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index a04afe79529c..63843037673c 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -121,7 +121,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
"ethernet-phy-ieee802.3-c45");
if (!is_c45 && !of_get_phy_id(child, &phy_id))
- phy = phy_device_create(mdio, addr, phy_id, 0, NULL);
+ phy = phy_device_create(mdio, addr, phy_id, 0);
else
phy = get_phy_device(mdio, addr, is_c45);
if (IS_ERR(phy)) {
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 2a695cd90c7c..662919c1dd27 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1213,8 +1213,7 @@ int phy_modify_paged(struct phy_device *phydev, int page,
u32 regnum,
u16 mask, u16 set);
struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
- bool is_c45,
- struct phy_c45_device_ids *c45_ids);
+ bool is_c45);
#if IS_ENABLED(CONFIG_PHYLIB)
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
int phy_device_register(struct phy_device *phy);
--
2.26.1
