lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: et131x: converting et131x_ioctl to use phy_mii_ioctl

Browse Source 
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>
This commit is contained in:
Mark Einon
2011-08-30 12:47:22 +01:00
committed by Greg Kroah-Hartman
parent 303dfbf572
commit f680751491
1 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/et131x/et131x_netdev.c
View File

@@ -207,47 +207,6 @@ int et131x_close(struct net_device *netdev)
return 0; return 0;
} }
/**
* 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 * et131x_ioctl - The I/O Control handler for the driver
* @netdev: device on which the control request is being made * @netdev: device on which the control request is being made
@@ -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 et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd)
{ {
int status = 0; struct et131x_adapter *adapter = netdev_priv(netdev);
switch (cmd) { if (!adapter->phydev)
case SIOCGMIIPHY: return -EINVAL;
case SIOCGMIIREG:
case SIOCSMIIREG:
status = et131x_ioctl_mii(netdev, reqbuf, cmd);
break;
default: return phy_mii_ioctl(adapter->phydev, reqbuf, cmd);
status = -EOPNOTSUPP;
}
return status;
} }
/** /**