netdev: Convert MDIO ioctl implementation to use struct mii_ioctl_data

A few drivers still access the arguments to MDIO ioctls as an array of
u16.  Convert them to use struct mii_ioctl_data.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index d836af1b9034..ee8ad3e180dd 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -85,6 +85,7 @@ earlier 3Com products.
 #include <linux/ioport.h>
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
+#include <linux/mii.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -1096,16 +1097,16 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct el3_private *lp = netdev_priv(dev);
         unsigned int ioaddr = dev->base_addr;
-        u16 *data = (u16 *)&rq->ifr_ifru;
+        struct mii_ioctl_data *data = if_mii(rq);
         int phy = lp->phys & 0x1f;
 
         DEBUG(2, "%s: In ioct(%-.6s, %#4.4x) %4.4x %4.4x %4.4x %4.4x.\n",
                   dev->name, rq->ifr_ifrn.ifrn_name, cmd,
-                  data[0], data[1], data[2], data[3]);
+                  data->phy_id, data->reg_num, data->val_in, data->val_out);
 
         switch(cmd) {
         case SIOCGMIIPHY:               /* Get the address of the PHY in use. */
-                data[0] = phy;
+                data->phy_id = phy;
         case SIOCGMIIREG:               /* Read the specified MII register. */
                 {
                         int saved_window;
@@ -1114,7 +1115,8 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                         spin_lock_irqsave(&lp->window_lock, flags);
                         saved_window = inw(ioaddr + EL3_CMD) >> 13;
                         EL3WINDOW(4);
-                        data[3] = mdio_read(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
+                        data->val_out = mdio_read(ioaddr, data->phy_id & 0x1f,
+                                                  data->reg_num & 0x1f);
                         EL3WINDOW(saved_window);
                         spin_unlock_irqrestore(&lp->window_lock, flags);
                         return 0;
@@ -1127,7 +1129,8 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                         spin_lock_irqsave(&lp->window_lock, flags);
                         saved_window = inw(ioaddr + EL3_CMD) >> 13;
                         EL3WINDOW(4);
-                        mdio_write(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2]);
+                        mdio_write(ioaddr, data->phy_id & 0x1f,
+                                   data->reg_num & 0x1f, data->val_in);
                         EL3WINDOW(saved_window);
                         spin_unlock_irqrestore(&lp->window_lock, flags);
                         return 0;