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

Commit 8cee0cd5 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[netdrvr] delete CONFIG_PHYCONTROL

parent bb40dcbb

drivers/net/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2076,7 +2076,6 @@ config GIANFAR 
	tristate "Gianfar Ethernet"

	depends on 85xx || 83xx

	select PHYLIB

	select PHYCONTROL

	help

	  This driver supports the Gigabit TSEC on the MPC85xx 

	  family of chips, and the FEC on the 8540

drivers/net/phy/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -12,14 +12,6 @@ config PHYLIB 
	  devices.  This option provides infrastructure for

	  managing PHY devices.



config PHYCONTROL

	bool "  Support for automatically handling PHY state changes"

	depends on PHYLIB

	help

	  Adds code to perform all the work for keeping PHY link

	  state (speed/duplex/etc) up-to-date.  Also handles

	  interrupts.



comment "MII PHY device drivers"

	depends on PHYLIB

drivers/net/phy/phy.c

+0 −8
Original line number Diff line number Diff line
@@ -242,10 +242,6 @@ EXPORT_SYMBOL(phy_sanitize_settings); 
 *   choose the next best ones from the ones selected, so we don't

 *   care if ethtool tries to give us bad values

 *

 * A note about the PHYCONTROL Layer.  If you turn off

 * CONFIG_PHYCONTROL, you will need to read the PHY status

 * registers after this function completes, and update your

 * controller manually.

 */

int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)

{
@@ -380,7 +376,6 @@ int phy_start_aneg(struct phy_device *phydev) 


	err = phydev->drv->config_aneg(phydev);



#ifdef CONFIG_PHYCONTROL

	if (err < 0)

		goto out_unlock;
@@ -395,14 +390,12 @@ int phy_start_aneg(struct phy_device *phydev) 
	}



out_unlock:

#endif

	spin_unlock(&phydev->lock);

	return err;

}

EXPORT_SYMBOL(phy_start_aneg);





#ifdef CONFIG_PHYCONTROL

static void phy_change(void *data);

static void phy_timer(unsigned long data);
@@ -868,4 +861,3 @@ static void phy_timer(unsigned long data) 
	mod_timer(&phydev->phy_timer, jiffies + PHY_STATE_TIME * HZ);

}

#endif /* CONFIG_PHYCONTROL */

drivers/net/phy/phy_device.c

+0 −3
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr) 
	return dev;

}



#ifdef CONFIG_PHYCONTROL

/* phy_prepare_link:

 *

 * description: Tells the PHY infrastructure to handle the
@@ -160,8 +159,6 @@ void phy_disconnect(struct phy_device *phydev) 
}

EXPORT_SYMBOL(phy_disconnect);



#endif /* CONFIG_PHYCONTROL */



/* phy_attach:

 *

 *   description: Called by drivers to attach to a particular PHY