On Tue, Jun 15, 2010 at 10:07 AM, Richard Cochran
<richardcoch...@gmail.com> wrote:
> Two maverick drivers filter the ioctl commands passed to phy_mii_ioctl().
> This is unnecessary since phylib will check the command in any case.
>
> Signed-off-by: Richard Cochran <richard.coch...@omicron.at>
At a glance, looks okay to me.
> ---
> drivers/net/cpmac.c | 5 +----
> drivers/net/stmmac/stmmac_main.c | 22 ++++++++--------------
> 2 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
> index d4c5ca4..0e47ca1 100644
> --- a/drivers/net/cpmac.c
> +++ b/drivers/net/cpmac.c
> @@ -846,11 +846,8 @@ static int cpmac_ioctl(struct net_device *dev, struct
> ifreq *ifr, int cmd)
> return -EINVAL;
> if (!priv->phy)
> return -EINVAL;
> - if ((cmd == SIOCGMIIPHY) || (cmd == SIOCGMIIREG) ||
> - (cmd == SIOCSMIIREG))
> - return phy_mii_ioctl(priv->phy, ifr, cmd);
>
> - return -EOPNOTSUPP;
> + return phy_mii_ioctl(priv->phy, ifr, cmd);
> }
>
> static int cpmac_get_settings(struct net_device *dev, struct ethtool_cmd
> *cmd)
> diff --git a/drivers/net/stmmac/stmmac_main.c
> b/drivers/net/stmmac/stmmac_main.c
> index 6af7471..acf0616 100644
> --- a/drivers/net/stmmac/stmmac_main.c
> +++ b/drivers/net/stmmac/stmmac_main.c
> @@ -1437,24 +1437,18 @@ static void stmmac_poll_controller(struct net_device
> *dev)
> static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> {
> struct stmmac_priv *priv = netdev_priv(dev);
> - int ret = -EOPNOTSUPP;
> + int ret;
>
> if (!netif_running(dev))
> return -EINVAL;
>
> - switch (cmd) {
> - case SIOCGMIIPHY:
> - case SIOCGMIIREG:
> - case SIOCSMIIREG:
> - if (!priv->phydev)
> - return -EINVAL;
> -
> - spin_lock(&priv->lock);
> - ret = phy_mii_ioctl(priv->phydev, rq, cmd);
> - spin_unlock(&priv->lock);
> - default:
> - break;
> - }
> + if (!priv->phydev)
> + return -EINVAL;
> +
> + spin_lock(&priv->lock);
> + ret = phy_mii_ioctl(priv->phydev, rq, cmd);
> + spin_unlock(&priv->lock);
> +
> return ret;
> }
>
> --
> 1.6.3.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-ker...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
