]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: xscale: Drop unused PHY number
authorLinus Walleij <linus.walleij@linaro.org>
Sat, 28 Oct 2023 20:48:35 +0000 (22:48 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 2 Nov 2023 05:15:15 +0000 (22:15 -0700)
For some cargoculted reason on incomplete cleanup, we have a
PHY number which refers to nothing and gives confusing messages
about PHY 0 on all ports.

Print the name of the actual PHY device instead.

Reported-by: Howard Harte <hharte@magicandroidapps.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20231028-ixp4xx-eth-id-v1-1-57be486d7f0f@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/xscale/ixp4xx_eth.c

index 531bf919aef50943bb28b6e4e2c9cadff734305b..e0d26148dfd95cf5eace5027cc06a43ecc737cb5 100644 (file)
@@ -163,7 +163,6 @@ typedef void buffer_t;
 
 /* Information about built-in Ethernet MAC interfaces */
 struct eth_plat_info {
-       u8 phy;         /* MII PHY ID, 0 - 31 */
        u8 rxq;         /* configurable, currently 0 - 31 only */
        u8 txreadyq;
        u8 hwaddr[ETH_ALEN];
@@ -1583,7 +1582,7 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
        if ((err = register_netdev(ndev)))
                goto err_phy_dis;
 
-       netdev_info(ndev, "%s: MII PHY %i on %s\n", ndev->name, plat->phy,
+       netdev_info(ndev, "%s: MII PHY %s on %s\n", ndev->name, phydev_name(phydev),
                    npe_name(port->npe));
 
        return 0;