iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[netdrvr] delete CONFIG_PHYCONTROL

Browse Source
This commit is contained in:
Jeff Garzik 2005-09-23 22:58:49 -04:00
parent bb40dcbb0f
commit 8cee0cd5be
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/Kconfig
View File

@ -2076,7 +2076,6 @@ config GIANFAR
tristate "Gianfar Ethernet" tristate "Gianfar Ethernet"
depends on 85xx || 83xx depends on 85xx || 83xx
select PHYLIB select PHYLIB
select PHYCONTROL
help help
This driver supports the Gigabit TSEC on the MPC85xx This driver supports the Gigabit TSEC on the MPC85xx
family of chips, and the FEC on the 8540 family of chips, and the FEC on the 8540

8
drivers/net/phy/Kconfig
View File

@ -12,14 +12,6 @@ config PHYLIB
devices. This option provides infrastructure for devices. This option provides infrastructure for
managing PHY devices. 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" comment "MII PHY device drivers"
depends on PHYLIB depends on PHYLIB

8
drivers/net/phy/phy.c
View File

@ -242,10 +242,6 @@ EXPORT_SYMBOL(phy_sanitize_settings);
* choose the next best ones from the ones selected, so we don't * choose the next best ones from the ones selected, so we don't
* care if ethtool tries to give us bad values * 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) 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); err = phydev->drv->config_aneg(phydev);
#ifdef CONFIG_PHYCONTROL
if (err < 0) if (err < 0)
goto out_unlock; goto out_unlock;
@ -395,14 +390,12 @@ int phy_start_aneg(struct phy_device *phydev)
} }
out_unlock: out_unlock:
#endif
spin_unlock(&phydev->lock); spin_unlock(&phydev->lock);
return err; return err;
} }
EXPORT_SYMBOL(phy_start_aneg); EXPORT_SYMBOL(phy_start_aneg);
#ifdef CONFIG_PHYCONTROL
static void phy_change(void *data); static void phy_change(void *data);
static void phy_timer(unsigned long 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); mod_timer(&phydev->phy_timer, jiffies + PHY_STATE_TIME * HZ);
} }
#endif /* CONFIG_PHYCONTROL */

3
drivers/net/phy/phy_device.c
View File

@ -101,7 +101,6 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
return dev; return dev;
} }
#ifdef CONFIG_PHYCONTROL
/* phy_prepare_link: /* phy_prepare_link:
* *
* description: Tells the PHY infrastructure to handle the * description: Tells the PHY infrastructure to handle the
@ -160,8 +159,6 @@ void phy_disconnect(struct phy_device *phydev)
} }
EXPORT_SYMBOL(phy_disconnect); EXPORT_SYMBOL(phy_disconnect);
#endif /* CONFIG_PHYCONTROL */
/* phy_attach: /* phy_attach:
* *
* description: Called by drivers to attach to a particular PHY * description: Called by drivers to attach to a particular PHY