Commit 04ff99f4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-fixed_phy-simplifications-and-improvements' 

Heiner Kallweit says:

====================
net: phy: fixed_phy: simplifications and improvements

This series includes two types of changes:
- All callers pass PHY_POLL, therefore remove irq argument
- constify the passed struct fixed_phy_status *status
====================

Link: https://patch.msgid.link/4d4c468e-300d-42c7-92a1-eabbdb6be748@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4c2bd791 4ba1c5bb

arch/m68k/coldfire/m5272.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct fixed_phy_status nettel_fixed_phy_status __initdata = { 
static int __init init_BSP(void)

{

	m5272_uarts_init();

	fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);

	fixed_phy_add(0, &nettel_fixed_phy_status);

	clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup));

	return 0;

}

arch/mips/bcm47xx/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int __init bcm47xx_register_bus_complete(void) 
	bcm47xx_leds_register();

	bcm47xx_workarounds();



	fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);

	fixed_phy_add(0, &bcm47xx_fixed_phy_status);

	return 0;

}

device_initcall(bcm47xx_register_bus_complete);

drivers/net/dsa/dsa_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int __init dsa_loop_init(void) 
	unsigned int i, ret;



	for (i = 0; i < NUM_FIXED_PHYS; i++)

		phydevs[i] = fixed_phy_register(PHY_POLL, &status, NULL);

		phydevs[i] = fixed_phy_register(&status, NULL);



	ret = mdio_driver_register(&dsa_loop_drv);

	if (ret)

drivers/net/ethernet/broadcom/bgmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac) 
	struct phy_device *phy_dev;

	int err;



	phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);

	phy_dev = fixed_phy_register(&fphy_status, NULL);

	if (IS_ERR(phy_dev)) {

		dev_err(bgmac->dev, "Failed to register fixed PHY device\n");

		return PTR_ERR(phy_dev);

drivers/net/ethernet/broadcom/genet/bcmmii.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv) 
			.asym_pause = 0,

		};



		phydev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);

		phydev = fixed_phy_register(&fphy_status, NULL);

		if (IS_ERR(phydev)) {

			dev_err(kdev, "failed to register fixed PHY device\n");

			return PTR_ERR(phydev);