Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2b97793 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phy: fixed-phy: remove fixed_phy_update_state() 



mvneta is the only user of fixed_phy_update_state(), which has been
converted to use phylink instead.  Remove fixed_phy_update_state().

Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c554f531

drivers/net/phy/fixed_phy.c

+0 −31
Original line number Diff line number Diff line
@@ -115,37 +115,6 @@ int fixed_phy_set_link_update(struct phy_device *phydev, 
}

EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);



int fixed_phy_update_state(struct phy_device *phydev,

			   const struct fixed_phy_status *status,

			   const struct fixed_phy_status *changed)

{

	struct fixed_mdio_bus *fmb = &platform_fmb;

	struct fixed_phy *fp;



	if (!phydev || phydev->mdio.bus != fmb->mii_bus)

		return -EINVAL;



	list_for_each_entry(fp, &fmb->phys, node) {

		if (fp->addr == phydev->mdio.addr) {

			write_seqcount_begin(&fp->seqcount);

#define _UPD(x) if (changed->x) \

	fp->status.x = status->x

			_UPD(link);

			_UPD(speed);

			_UPD(duplex);

			_UPD(pause);

			_UPD(asym_pause);

#undef _UPD

			fixed_phy_update(fp);

			write_seqcount_end(&fp->seqcount);

			return 0;

		}

	}



	return -ENOENT;

}

EXPORT_SYMBOL(fixed_phy_update_state);



int fixed_phy_add(unsigned int irq, int phy_addr,

		  struct fixed_phy_status *status,

		  int link_gpio)

include/linux/phy_fixed.h

+0 −9
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ extern void fixed_phy_unregister(struct phy_device *phydev); 
extern int fixed_phy_set_link_update(struct phy_device *phydev,

			int (*link_update)(struct net_device *,

					   struct fixed_phy_status *));

extern int fixed_phy_update_state(struct phy_device *phydev,

			   const struct fixed_phy_status *status,

			   const struct fixed_phy_status *changed);

#else

static inline int fixed_phy_add(unsigned int irq, int phy_id,

				struct fixed_phy_status *status,
@@ -50,12 +47,6 @@ static inline int fixed_phy_set_link_update(struct phy_device *phydev, 
{

	return -ENODEV;

}

static inline int fixed_phy_update_state(struct phy_device *phydev,

			   const struct fixed_phy_status *status,

			   const struct fixed_phy_status *changed)

{

	return -ENODEV;

}

#endif /* CONFIG_FIXED_PHY */



#endif /* __PHY_FIXED_H */