diff options
author | Mark Einon <mark.einon@gmail.com> | 2011-08-30 12:47:22 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:49:27 -0700 |
commit | f6807514910f2d3c9d19e2cdd369a31aade73e6f (patch) | |
tree | 427cffc6dca107dc066e4f8048ea9f6445b66aa3 | |
parent | 303dfbf5727410bfa3e82d4e2554813f1e8f2de6 (diff) | |
download | op-kernel-dev-f6807514910f2d3c9d19e2cdd369a31aade73e6f.zip op-kernel-dev-f6807514910f2d3c9d19e2cdd369a31aade73e6f.tar.gz |
staging: et131x: converting et131x_ioctl to use phy_mii_ioctl
Handing over ioctls handled by the driver to the phydev.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 56 |
1 files changed, 4 insertions, 52 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index ce21433..d12e05e 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c @@ -208,47 +208,6 @@ int et131x_close(struct net_device *netdev) } /** - * et131x_ioctl_mii - The function which handles MII IOCTLs - * @netdev: device on which the query is being made - * @reqbuf: the request-specific data buffer - * @cmd: the command request code - * - * Returns 0 on success, errno on failure (as defined in errno.h) - */ -int et131x_ioctl_mii(struct net_device *netdev, struct ifreq *reqbuf, int cmd) -{ - int status = 0; - struct et131x_adapter *adapter = netdev_priv(netdev); - struct mii_ioctl_data *data = if_mii(reqbuf); - - switch (cmd) { - case SIOCGMIIPHY: - data->phy_id = adapter->stats.xcvr_addr; - break; - - case SIOCGMIIREG: - if (!capable(CAP_NET_ADMIN)) - status = -EPERM; - else - status = et131x_mii_read(adapter, - data->reg_num, &data->val_out); - break; - - case SIOCSMIIREG: - if (!capable(CAP_NET_ADMIN)) - status = -EPERM; - else - status = et131x_mii_write(adapter, data->reg_num, - data->val_in); - break; - - default: - status = -EOPNOTSUPP; - } - return status; -} - -/** * et131x_ioctl - The I/O Control handler for the driver * @netdev: device on which the control request is being made * @reqbuf: a pointer to the IOCTL request buffer @@ -258,19 +217,12 @@ int et131x_ioctl_mii(struct net_device *netdev, struct ifreq *reqbuf, int cmd) */ int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd) { - int status = 0; + struct et131x_adapter *adapter = netdev_priv(netdev); - switch (cmd) { - case SIOCGMIIPHY: - case SIOCGMIIREG: - case SIOCSMIIREG: - status = et131x_ioctl_mii(netdev, reqbuf, cmd); - break; + if (!adapter->phydev) + return -EINVAL; - default: - status = -EOPNOTSUPP; - } - return status; + return phy_mii_ioctl(adapter->phydev, reqbuf, cmd); } /** |