]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: dpaa_eth: simplify dpaa_ioctl()
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 8 May 2025 12:47:53 +0000 (15:47 +0300)
committerJakub Kicinski <kuba@kernel.org>
Fri, 9 May 2025 23:40:22 +0000 (16:40 -0700)
phylink_mii_ioctl() handles multiple ioctls in addition to just
SIOCGMIIREG: SIOCGMIIPHY, SIOCSMIIREG. Don't filter these out.

Also, phylink can handle the case where net_dev->phydev is NULL (like
optical SFP module, fixed-link). Be like other drivers and let phylink
do so without any driver-side call filtering.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
Link: https://patch.msgid.link/20250508124753.1492742-4-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

index 5b8d87a0bf82c1623e2bb9cfee6639cb78e7b38a..23c23cca262091d296568f1f84a5c2ccdc3bcccb 100644 (file)
@@ -3139,16 +3139,9 @@ static int dpaa_hwtstamp_set(struct net_device *dev,
 
 static int dpaa_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd)
 {
-       int ret = -EINVAL;
        struct dpaa_priv *priv = netdev_priv(net_dev);
 
-       if (cmd == SIOCGMIIREG) {
-               if (net_dev->phydev)
-                       return phylink_mii_ioctl(priv->mac_dev->phylink, rq,
-                                                cmd);
-       }
-
-       return ret;
+       return phylink_mii_ioctl(priv->mac_dev->phylink, rq, cmd);
 }
 
 static const struct net_device_ops dpaa_ops = {