phy: add phy_device_remove() (38737e49) · Commits · 戴 / test

drivers/net/ethernet/freescale/gianfar.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1702,7 +1702,6 @@ static void gfar_configure_serdes(struct net_device *dev)
	tbiphy = of_phy_find_device(priv->tbi_node);		tbiphy = of_phy_find_device(priv->tbi_node);
	if (!tbiphy) {		if (!tbiphy) {
	dev_err(&dev->dev, "error: Could not get TBI device\n");		dev_err(&dev->dev, "error: Could not get TBI device\n");
	put_device(&tbiphy->dev);
	return;		return;
	}		}

	@@ -1711,8 +1710,10 @@ static void gfar_configure_serdes(struct net_device *dev)
	* everything for us? Resetting it takes the link down and requires		* everything for us? Resetting it takes the link down and requires
	* several seconds for it to come back.		* several seconds for it to come back.
	*/		*/
	if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS)		if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS) {
			put_device(&tbiphy->dev);
	return;		return;
			}

	/* Single clk mode, mii mode off(for serdes communication) */		/* Single clk mode, mii mode off(for serdes communication) */
	phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);		phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -291,8 +291,11 @@ int __mdiobus_register(struct mii_bus bus, struct module owner)

	error:		error:
	while (--i >= 0) {		while (--i >= 0) {
	if (bus->phy_map[i])		struct phy_device *phydev = bus->phy_map[i];
	device_unregister(&bus->phy_map[i]->dev);		if (phydev) {
			phy_device_remove(phydev);
			phy_device_free(phydev);
			}
	}		}
	device_del(&bus->dev);		device_del(&bus->dev);
	return err;		return err;
	@@ -307,9 +310,11 @@ void mdiobus_unregister(struct mii_bus *bus)
	bus->state = MDIOBUS_UNREGISTERED;		bus->state = MDIOBUS_UNREGISTERED;

	for (i = 0; i < PHY_MAX_ADDR; i++) {		for (i = 0; i < PHY_MAX_ADDR; i++) {
	if (bus->phy_map[i])		struct phy_device *phydev = bus->phy_map[i];
	device_unregister(&bus->phy_map[i]->dev);		if (phydev) {
	bus->phy_map[i] = NULL;		phy_device_remove(phydev);
			phy_device_free(phydev);
			}
	}		}
	device_del(&bus->dev);		device_del(&bus->dev);
	}		}

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -383,6 +383,24 @@ int phy_device_register(struct phy_device *phydev)
	}		}
	EXPORT_SYMBOL(phy_device_register);		EXPORT_SYMBOL(phy_device_register);

			/**
			* phy_device_remove - Remove a previously registered phy device from the MDIO bus
			* @phydev: phy_device structure to remove
			*
			* This doesn't free the phy_device itself, it merely reverses the effects
			* of phy_device_register(). Use phy_device_free() to free the device
			* after calling this function.
			*/
			void phy_device_remove(struct phy_device *phydev)
			{
			struct mii_bus *bus = phydev->bus;
			int addr = phydev->addr;

			device_del(&phydev->dev);
			bus->phy_map[addr] = NULL;
			}
			EXPORT_SYMBOL(phy_device_remove);

	/**		/**
	* phy_find_first - finds the first PHY device on the bus		* phy_find_first - finds the first PHY device on the bus
	* @bus: the target MII bus		* @bus: the target MII bus

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -745,6 +745,7 @@ struct phy_device phy_device_create(struct mii_bus bus, int addr, int phy_id,
	struct phy_c45_device_ids *c45_ids);		struct phy_c45_device_ids *c45_ids);
	struct phy_device get_phy_device(struct mii_bus bus, int addr, bool is_c45);		struct phy_device get_phy_device(struct mii_bus bus, int addr, bool is_c45);
	int phy_device_register(struct phy_device *phy);		int phy_device_register(struct phy_device *phy);
			void phy_device_remove(struct phy_device *phydev);
	int phy_init_hw(struct phy_device *phydev);		int phy_init_hw(struct phy_device *phydev);
	int phy_suspend(struct phy_device *phydev);		int phy_suspend(struct phy_device *phydev);
	int phy_resume(struct phy_device *phydev);		int phy_resume(struct phy_device *phydev);