diff mbox

[net-next] mdio: unused ethtool functions

Message ID 20131226101241.5f38e392@nehalam.linuxnetplumber.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Hemminger Dec. 26, 2013, 6:12 p.m. UTC
Use it or lose it.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

---
 drivers/net/mdio.c   |   28 ----------------------------
 include/linux/mdio.h |    3 ---
 2 files changed, 31 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Dec. 26, 2013, 6:30 p.m. UTC | #1
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 26 Dec 2013 10:12:41 -0800

> Use it or lose it.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ben Hutchings Dec. 27, 2013, 9:06 a.m. UTC | #2
On Thu, 2013-12-26 at 10:12 -0800, Stephen Hemminger wrote:
> Use it or lose it.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Right, this was called by sfc for a while but not since 2.6.33 as we set
all the autoneg bits at once.

Ben.

> ---
>  drivers/net/mdio.c   |   28 ----------------------------
>  include/linux/mdio.h |    3 ---
>  2 files changed, 31 deletions(-)
> 
> --- a/drivers/net/mdio.c	2013-12-24 15:37:35.779661759 -0800
> +++ b/drivers/net/mdio.c	2013-12-24 15:38:26.054970175 -0800
> @@ -342,34 +342,6 @@ void mdio45_ethtool_gset_npage(const str
>  EXPORT_SYMBOL(mdio45_ethtool_gset_npage);
>  
>  /**
> - * mdio45_ethtool_spauseparam_an - set auto-negotiated pause parameters
> - * @mdio: MDIO interface
> - * @ecmd: Ethtool request structure
> - *
> - * This function assumes that the PHY has an auto-negotiation MMD.  It
> - * will enable and disable advertising of flow control as appropriate.
> - */
> -void mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
> -				   const struct ethtool_pauseparam *ecmd)
> -{
> -	int adv, old_adv;
> -
> -	WARN_ON(!(mdio->mmds & MDIO_DEVS_AN));
> -
> -	old_adv = mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_AN,
> -				  MDIO_AN_ADVERTISE);
> -	adv = ((old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) |
> -	       mii_advertise_flowctrl((ecmd->rx_pause ? FLOW_CTRL_RX : 0) |
> -				      (ecmd->tx_pause ? FLOW_CTRL_TX : 0)));
> -	if (adv != old_adv) {
> -		mdio->mdio_write(mdio->dev, mdio->prtad, MDIO_MMD_AN,
> -				 MDIO_AN_ADVERTISE, adv);
> -		mdio45_nway_restart(mdio);
> -	}
> -}
> -EXPORT_SYMBOL(mdio45_ethtool_spauseparam_an);
> -
> -/**
>   * mdio_mii_ioctl - MII ioctl interface for MDIO (clause 22 or 45) PHYs
>   * @mdio: MDIO interface
>   * @mii_data: MII ioctl data structure
> --- a/include/linux/mdio.h	2013-12-24 15:37:35.779661759 -0800
> +++ b/include/linux/mdio.h	2013-12-24 15:38:26.054970175 -0800
> @@ -70,9 +70,6 @@ extern int mdio45_nway_restart(const str
>  extern void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
>  				      struct ethtool_cmd *ecmd,
>  				      u32 npage_adv, u32 npage_lpa);
> -extern void
> -mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
> -			      const struct ethtool_pauseparam *ecmd);
>  
>  /**
>   * mdio45_ethtool_gset - get settings for ETHTOOL_GSET
diff mbox

Patch

--- a/drivers/net/mdio.c	2013-12-24 15:37:35.779661759 -0800
+++ b/drivers/net/mdio.c	2013-12-24 15:38:26.054970175 -0800
@@ -342,34 +342,6 @@  void mdio45_ethtool_gset_npage(const str
 EXPORT_SYMBOL(mdio45_ethtool_gset_npage);
 
 /**
- * mdio45_ethtool_spauseparam_an - set auto-negotiated pause parameters
- * @mdio: MDIO interface
- * @ecmd: Ethtool request structure
- *
- * This function assumes that the PHY has an auto-negotiation MMD.  It
- * will enable and disable advertising of flow control as appropriate.
- */
-void mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
-				   const struct ethtool_pauseparam *ecmd)
-{
-	int adv, old_adv;
-
-	WARN_ON(!(mdio->mmds & MDIO_DEVS_AN));
-
-	old_adv = mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_AN,
-				  MDIO_AN_ADVERTISE);
-	adv = ((old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) |
-	       mii_advertise_flowctrl((ecmd->rx_pause ? FLOW_CTRL_RX : 0) |
-				      (ecmd->tx_pause ? FLOW_CTRL_TX : 0)));
-	if (adv != old_adv) {
-		mdio->mdio_write(mdio->dev, mdio->prtad, MDIO_MMD_AN,
-				 MDIO_AN_ADVERTISE, adv);
-		mdio45_nway_restart(mdio);
-	}
-}
-EXPORT_SYMBOL(mdio45_ethtool_spauseparam_an);
-
-/**
  * mdio_mii_ioctl - MII ioctl interface for MDIO (clause 22 or 45) PHYs
  * @mdio: MDIO interface
  * @mii_data: MII ioctl data structure
--- a/include/linux/mdio.h	2013-12-24 15:37:35.779661759 -0800
+++ b/include/linux/mdio.h	2013-12-24 15:38:26.054970175 -0800
@@ -70,9 +70,6 @@  extern int mdio45_nway_restart(const str
 extern void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
 				      struct ethtool_cmd *ecmd,
 				      u32 npage_adv, u32 npage_lpa);
-extern void
-mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
-			      const struct ethtool_pauseparam *ecmd);
 
 /**
  * mdio45_ethtool_gset - get settings for ETHTOOL_GSET