v1.5 branch refresh based upon upstream master @ c8677ca89e53e3be7988d54280fce166cc894a7e

[librecmc/librecmc.git] / target / linux / generic / files / drivers / net / phy / b53 / b53_mdio.c

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
index 185c95ffa73d315600ea85bea920039b9ede7b23..75bb4d941c42d435d7c41a6d3531a0b018aa010c 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
@@ -277,11 +277,11 @@ static int b53_phy_probe(struct phy_device *phydev)
        int ret;
 
        /* allow the generic phy driver to take over */
-       if (phydev->addr != B53_PSEUDO_PHY && phydev->addr != 0)
+       if (phydev->mdio.addr != B53_PSEUDO_PHY && phydev->mdio.addr != 0)
                return -ENODEV;
 
        dev.current_page = 0xff;
-       dev.priv = phydev->bus;
+       dev.priv = phydev->mdio.bus;
        dev.ops = &b53_mdio_ops;
        dev.pdata = NULL;
        mutex_init(&dev.reg_mutex);
@@ -305,7 +305,7 @@ static int b53_phy_config_init(struct phy_device *phydev)
        struct b53_device *dev;
        int ret;
 
-       dev = b53_switch_alloc(&phydev->dev, &b53_mdio_ops, phydev->bus);
+       dev = b53_switch_alloc(&phydev->mdio.dev, &b53_mdio_ops, phydev->mdio.bus);
        if (!dev)
                return -ENOMEM;
 
@@ -372,9 +372,6 @@ static struct phy_driver b53_phy_driver_id1 = {
        .config_aneg    = b53_phy_config_aneg,
        .config_init    = b53_phy_config_init,
        .read_status    = b53_phy_read_status,
-       .driver = {
-               .owner = THIS_MODULE,
-       },
 };
 
 /* BCM53125, BCM53128 */
@@ -388,9 +385,6 @@ static struct phy_driver b53_phy_driver_id2 = {
        .config_aneg    = b53_phy_config_aneg,
        .config_init    = b53_phy_config_init,
        .read_status    = b53_phy_read_status,
-       .driver = {
-               .owner = THIS_MODULE,
-       },
 };
 
 /* BCM5365 */
@@ -404,24 +398,21 @@ static struct phy_driver b53_phy_driver_id3 = {
        .config_aneg    = b53_phy_config_aneg,
        .config_init    = b53_phy_config_init,
        .read_status    = b53_phy_read_status,
-       .driver = {
-               .owner = THIS_MODULE,
-       },
 };
 
 int __init b53_phy_driver_register(void)
 {
        int ret;
 
-       ret = phy_driver_register(&b53_phy_driver_id1);
+       ret = phy_driver_register(&b53_phy_driver_id1, THIS_MODULE);
        if (ret)
                return ret;
 
-       ret = phy_driver_register(&b53_phy_driver_id2);
+       ret = phy_driver_register(&b53_phy_driver_id2, THIS_MODULE);
        if (ret)
                goto err1;
 
-       ret = phy_driver_register(&b53_phy_driver_id3);
+       ret = phy_driver_register(&b53_phy_driver_id3, THIS_MODULE);
        if (!ret)
                return 0;